Ticket #16645: 16645.patch

tests/modeltests/model_forms/tests.py

@@ -1317 +1317 @@
         f = OptionalImageFileForm(data={'description': u'Test'})
         self.assertEqual(f.is_valid(), True)
         instance = f.save()
-        self.assertEqual(instance.image.name, None)
+        self.assertEqual(instance.image.name, '')
         self.assertEqual(instance.width, None)
         self.assertEqual(instance.height, None)
 

tests/modeltests/model_forms/models.py

@@ -132 +132 @@
         description = models.CharField(max_length=20)
         image = models.ImageField(storage=temp_storage, upload_to=custom_upload_path,
                                   width_field='width', height_field='height',
-                                  blank=True, null=True)
+                                  blank=True)
         width = models.IntegerField(editable=False, null=True)
         height = models.IntegerField(editable=False, null=True)
         path = models.CharField(max_length=16, blank=True, default='')