Do not assign new fp attribute to image when closing

python-pillow · Nov 16, 2023 · 67e1253 · 67e1253
1 parent b25ece3
commit 67e1253
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/Tests/test_image.py b/Tests/test_image.py
@@ -1027,7 +1027,6 @@ def test_close_graceful(self):
 
             assert len(self._caplog.records) == 0
             assert im.fp is None
-            assert copy.fp is None
 
 
 class MockEncoder:

diff --git a/src/PIL/Image.py b/src/PIL/Image.py
@@ -549,17 +549,17 @@ def close(self):
         :py:meth:`~PIL.Image.Image.load` method. See :ref:`file-handling` for
         more information.
         """
-        try:
-            if hasattr(self, "fp"):
+        if hasattr(self, "fp"):
+            try:
                 if getattr(self, "_fp", False):
                     if self._fp != self.fp:
                         self._fp.close()
                     self._fp = DeferredError(ValueError("Operation on closed image"))
                 if self.fp:
                     self.fp.close()
-            self.fp = None
-        except Exception as msg:
-            logger.debug("Error closing: %s", msg)
+                self.fp = None
+            except Exception as msg:
+                logger.debug("Error closing: %s", msg)
 
         if getattr(self, "map", None):
             self.map = None