Fixed #21238 -- Fixed restoring attributes when pickling FileField and ImageField.

1 files changed, 15 insertions, 5 deletions

diff --git a/django/db/models/fields/files.py b/django/db/models/fields/files.py
index b03d54366a..7ee38d937f 100644
--- a/django/db/models/fields/files.py
+++ b/django/db/models/fields/files.py
@@ -123,11 +123,21 @@ class FieldFile(File):
             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}
+        # FieldFile needs access to its associated model field, an instance and
+        # the file's name. Everything else will be restored later, by
+        # FileDescriptor below.
+        return {
+            'name': self.name,
+            'closed': False,
+            '_committed': True,
+            '_file': None,
+            'instance': self.instance,
+            'field': self.field,
+        }
+
+    def __setstate__(self, state):
+        self.__dict__.update(state)
+        self.storage = self.field.storage
 
 
 class FileDescriptor: