separate

Author: radarhere

src/PIL/Image.py

@@ -590,16 +590,11 @@ def _new(self, im: core.ImagingCore) -> Image:
         return new
 
     # Context manager support
-    def __enter__(self):
+    def __enter__(self) -> Image:
         return self
 
-    def __exit__(self, *args):
-        from . import ImageFile
-
-        if isinstance(self, ImageFile.ImageFile):
-            if getattr(self, "_exclusive_fp", False):
-                self._close_fp()
-            self.fp = None
+    def __exit__(self, *args: object) -> None:
+        pass
 
     def close(self) -> None:
         """

src/PIL/ImageFile.py

@@ -167,14 +167,23 @@ def __init__(
     def _open(self) -> None:
         pass
 
-    def _close_fp(self):
+    # Context manager support
+    def __enter__(self) -> ImageFile:
+        return self
+
+    def _close_fp(self) -> None:
         if getattr(self, "_fp", False) and not isinstance(self._fp, DeferredError):
             if self._fp != self.fp:
                 self._fp.close()
             self._fp = DeferredError(ValueError("Operation on closed image"))
         if self.fp:
             self.fp.close()
 
+    def __exit__(self, *args: object) -> None:
+        if getattr(self, "_exclusive_fp", False):
+            self._close_fp()
+        self.fp = None
+
     def close(self) -> None:
         """
         Closes the file pointer, if possible.