Ticket #14681: 14681_unified.diff

django/core/files/base.py

@@ -15 +15 @@
         if name is None:
             name = getattr(file, 'name', None)
         self.name = name
-        self.mode = getattr(file, 'mode', None)
+        if hasattr(file, 'mode'):
+            self.mode = getattr(file, 'mode')
 
     def __str__(self):
         return smart_str(self.name or '')

tests/modeltests/files/tests.py

@@ -3 +3 @@
 import shutil
 import sys
 import tempfile
+import gzip
 
 from django.core.cache import cache
 from django.core.files import File
@@ -101 +102 @@
         obj4.random.save("random_file", ContentFile("random content"))
         self.assertTrue(obj4.random.name.endswith("/random_file"))
 
+        # should not set mode to None if it is not present
+        file = SimpleUploadedFile("mode_test.txt", "content")
+        self.assertFalse(hasattr(file, 'mode'))
+
+        # Verify fix for #14681, File like objects should not explicitly set
+        # mode=None for compatibility with stdlib gzip
+        file = SimpleUploadedFile("gzip_test.txt", "content")
+        self.assertFalse(hasattr(file, 'mode'))
+        g = gzip.GzipFile(fileobj=file)
+        
         # Clean up the temporary files and dir.
         obj1.normal.delete()
         obj2.normal.delete()