Ticket #8817: 8817-final.patch

django/core/files/images.py

@@ -28 +28 @@
     """Returns the (width, height) of an image, given an open file or a path."""
     from PIL import ImageFile as PILImageFile
     p = PILImageFile.Parser()
+    close = False
     if hasattr(file_or_path, 'read'):
         file = file_or_path
     else:
         file = open(file_or_path, 'rb')
-    while 1:
-        data = file.read(1024)
-        if not data:
-            break
-        p.feed(data)
-        if p.image:
-            return p.image.size
-    return None
+        close = True
+    try:
+        while 1:
+            data = file.read(1024)
+            if not data:
+                break
+            p.feed(data)
+            if p.image:
+                return p.image.size
+        return None
+    finally:
+        if close:
+            file.close()

tests/regressiontests/file_storage/tests.py

@@ -90 +90 @@
 import time
 import shutil
 import tempfile
+from cStringIO import StringIO
 from unittest import TestCase
 from django.conf import settings
 from django.core.files.base import ContentFile
 from django.core.files.storage import FileSystemStorage
+from django.core.files.images import get_image_dimensions
 try:
     import threading
 except ImportError:
     import dummy_threading as threading
 
+try:
+    # Checking for the existence of Image is enough for CPython, but
+    # for PyPy, you need to check for the underlying modules
+    from PIL import Image, _imaging
+except ImportError:
+    Image = None
+
 class SlowFile(ContentFile):
     def chunks(self):
         time.sleep(1)
@@ -141 +150 @@
         actual_mode = os.stat(self.storage.path(name))[0] & 0777
         self.assertEqual(actual_mode, 0666)
 
+if Image is not None:
+
+    # for ticket #8817
+    class DimensionClosingBug(TestCase):
+        def test_not_closing_of_files(self):
+            empty_io = StringIO()
+            try:
+                get_image_dimensions(empty_io)
+            finally:
+                self.assert_(not empty_io.closed)
+
+        def test_closing_of_filenames(self):
+            # provide a modified open() for the images module
+            # that checks if the file was closed properly if the
+            # function is called with a filename instead of an file
+            # object.  get_image_dimensions will call our catching_open
+            # instead of the regular builtin one.
+
+            _closed = []
+            class FileWrapper(object):
+                def __init__(self, f):
+                    self.f = f
+                def __getattr__(self, name):
+                    return getattr(self.f, name)
+                def close(self):
+                    _closed.append(True)
+                    self.f.close()
+
+            def catching_open(*args):
+                return FileWrapper(open(*args))
+
+            from django.core.files import images
+            images.open = catching_open
+            try:
+                get_image_dimensions(os.path.join(os.path.dirname(__file__), "test1.png"))
+            finally:
+                del images.open
+            self.assert_(_closed)