Ticket #11084: 11084.diff

django/db/models/fields/files.py

@@ -300 +300 @@
     assigning the width/height to the width_field/height_field, if appropriate.
     """
     def __set__(self, instance, value):
+        update_dimensions = instance.__dict__.get(self.field.name) is not None
         super(ImageFileDescriptor, self).__set__(instance, value)
         
         # The rest of this method deals with width/height fields, so we can
-        # bail early if neither is used.
-        if not self.field.width_field and not self.field.height_field:
+        # bail early if neither is used or we don't have to update the
+        # dimensons because the data is coming from the database
+        if not (update_dimensions and (self.field.width_field or
+                                       self.field.height_field)):
             return
         
         # We need to call the descriptor's __get__ to coerce this assigned 

tests/regressiontests/file_storage/models.py

@@ -2 +2 @@
 import tempfile
 import shutil
 from django.db import models
+from django.db.models.fields.files import ImageFieldFile, ImageField
 from django.core.files.storage import FileSystemStorage
 from django.core.files.base import ContentFile
 
@@ -17 +18 @@
 
 # If we have PIL, do these tests
 if Image:
+    class TestImageFieldFile(ImageFieldFile):
+        def __init__(self, *args, **kwargs):
+            self.test_was_opened = False
+            super(TestImageFieldFile, self).__init__(*args,**kwargs)
+        def open(self):
+            self.test_was_opened = True
+            super(TestImageFieldFile, self).open()
+    class TestImageField(ImageField):
+        attr_class = TestImageFieldFile
+
     temp_storage_dir = tempfile.mkdtemp()
     temp_storage = FileSystemStorage(temp_storage_dir)
 
     class Person(models.Model):
         name = models.CharField(max_length=50)
-        mugshot = models.ImageField(storage=temp_storage, upload_to='tests',
+        mugshot = TestImageField(storage=temp_storage, upload_to='tests',
                                     height_field='mug_height',
                                     width_field='mug_width')
         mug_height = models.PositiveSmallIntegerField()
@@ -72 +83 @@
 
 # Get a "clean" model instance
 >>> p3 = Person.objects.get(name="Joan")
+>>> p3.mugshot.test_was_opened
+False
 
 # It won't have an opened file.
 >>> p3.mugshot.closed
 True
 
+# Bug #11084: If the file is unavailable, still create the object without error.
+>>> path = p3.mugshot.path
+>>> shutil.move(path, path + '2')
+>>> p4 = Person.objects.get(name="Joan")
+>>> shutil.move(path + '2', path)
+
+
 # After asking for the size, the file should still be closed.
 >>> _ = p3.mugshot.size
 >>> p3.mugshot.closed