Context Navigation

Ticket #21238: alternative_patch_ticket_21238.patch

File alternative_patch_ticket_21238.patch, 2.0 KB (added by Vajrasky Kok, 10 years ago)

diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index 08ac441..380f892 100644

                class FieldFile(File):
         if file is not None:
             file.close()
-    def __getstate__(self):
-        # FieldFile needs access to its associated model field and an instance
-        # it's attached to in order to work properly, but the only necessary
-        # data to be pickled is the file's name itself. Everything else will
-        # be restored later, by FileDescriptor below.
-        return {'name': self.name, 'closed': False, '_committed': True, '_file': None}
 class FileDescriptor(object):
     """

diff --git a/tests/model_fields/test_imagefield.py b/tests/model_fields/test_imagefield.py
index 90b7a65..c07199c 100644

                class ImageFieldTests(ImageFieldTestMixin, TestCase):
     def test_pickle(self):
         """
         Tests that ImageField can be pickled, unpickled, and that the
         image of the unpickled version is the same as the original.
+        Tests that ImageField and ImageFieldFile can be pickled, unpickled,
+        and that the image of the unpickled version is the same as the original.
         """
         import pickle
+        # Pickle the person (ImageField)
         p = Person(name="Joe")
         p.mugshot.save("mug", self.file1)
         dump = pickle.dumps(p)
-…
+               class ImageFieldTests(ImageFieldTestMixin, TestCase):
         loaded_p = pickle.loads(dump)
         self.assertEqual(p.mugshot, loaded_p.mugshot)
+        # Pickle the mugshot (ImageFieldFile)
+        dump = pickle.dumps(p.mugshot)
+        loaded_mugshot = pickle.loads(dump)
+        self.assertEqual(p.mugshot.url, loaded_mugshot.url)
 @skipIf(Image is None, "Pillow/PIL is required to test ImageField")
 class ImageFieldTwoDimensionsTests(ImageFieldTestMixin, TestCase):