Ticket #10244: null-filefield.diff

django/db/models/fields/files.py

@@ -20 +20 @@
         self.instance = instance
         self.field = field
         self.storage = field.storage
-        self._name = name or u''
+        self._name = name
         self._closed = False
         self._committed = True
 
@@ -175 +175 @@
     def get_db_prep_value(self, value):
         "Returns field's value prepared for saving into a database."
         # Need to convert File objects provided via a form to unicode for database insertion
-        if value is None:
+        if value is None:
             return None
         return unicode(value)
 

tests/modeltests/files/models.py

@@ -31 +31 @@
 
     normal = models.FileField(storage=temp_storage, upload_to='tests')
     custom = models.FileField(storage=temp_storage, upload_to=custom_upload_to)
-    random = models.FileField(storage=temp_storage, upload_to=random_upload_to)
+    random = models.FileField(storage=temp_storage, upload_to=random_upload_to)
     default = models.FileField(storage=temp_storage, upload_to='tests', default='tests/default.txt')
 
 __test__ = {'API_TESTS':"""
@@ -127 +127 @@
 >>> obj4.random.save('random_file', ContentFile('random content'))
 >>> obj4.random
 <FieldFile: .../random_file>
+
+
+
+
+
+
 
 # Clean up the temporary files and dir.
 >>> obj1.normal.delete()