Changeset 8638

Timestamp:

08/27/08 16:30:47 (3 months ago)

Author:

jacob

Message:

Fixed #8534: getting the size of a file no longer opens it (at least for the built-in file-system storage). Thanks, snaury.

Files:

• django/trunk/django/db/models/fields/files.py (modified) (1 diff)
• django/trunk/tests/regressiontests/file_storage/models.py (modified) (1 diff)

django/trunk/django/db/models/fields/files.py

@@ -54 +54 @@
-        return self.storage.url(self.name)
-    url = property(_get_url)
+
+    def _get_size(self):
+        self._require_file()
+        return self.storage.size(self.name)
+    size = property(_get_size)
-
-    def open(self, mode='rb'):

django/trunk/tests/regressiontests/file_storage/models.py

@@ -47 +47 @@
->>> os.remove(p2.mugshot.path)
->>> p2.delete()
+
+# Bug #8534: FileField.size should not leave the file open.
+>>> p3 = Person(name="Joan")
+>>> p3.mugshot.save("shot", ContentFile(image_data))
+
+# Get a "clean" model instance
+>>> p3 = Person.objects.get(name="Joan")
+
+# It won't have an opened file. This is a bit brittle since it depends on the
+# the internals of FieldFile, but there's no other way of telling if the
+# file's been opened or not.
+>>> hasattr(p3.mugshot, '_file')
+False
+
+# After asking for the size, the file should still be closed.
+>>> _ = p3.mugshot.size
+>>> hasattr(p3.mugshot, '_file')
+False
-"""}
-