Changeset 7025

Timestamp:

01/18/08 09:53:19 (6 months ago)

Author:

jacob

Message:

Fixed #6302 for ImageFields?.

Files:

• django/trunk/django/newforms/fields.py (modified) (1 diff)
• django/trunk/tests/modeltests/model_forms/models.py (modified) (7 diffs)
• django/trunk/tests/modeltests/model_forms/test.png (added)

django/trunk/django/newforms/fields.py

@@ -467 +467 @@
-        if f is None:
-            return None
+        elif not data and initial:
+            return initial
-        from PIL import Image
-        from cStringIO import StringIO

django/trunk/tests/modeltests/model_forms/models.py

@@ -63 +63 @@
-    file = models.FileField(upload_to=tempfile.gettempdir())
-
+    def __unicode__(self):
+        return self.description
+        
+class ImageFile(models.Model):
+    description = models.CharField(max_length=20)
+    image = models.FileField(upload_to=tempfile.gettempdir())
+    
-    def __unicode__(self):
-        return self.description
@@ -719 +726 @@
-...         model = TextFile
-
-
+# 
-
->>> f = TextFileForm(data={'description': u'Assistance'})
@@ -728 +735 @@
-False
-
-
+# 
-
->>> f = TextFileForm(data={'description': u'Assistance'}, files={'file': {'filename': 'test1.txt', 'content': 'hello world'}})
@@ -739 +746 @@
-u'.../test1.txt'
-
-
-
+# 
+# 
-
->>> f = TextFileForm(data={'description': u'Assistance'}, instance=instance)
@@ -751 +758 @@
-u'.../test1.txt'
-
-
+# 
-
->>> os.unlink(instance.get_file_filename())
-
-
+# 
-
->>> f = TextFileForm(data={'description': u'Assistance'}, files={'file': {'filename': 'test2.txt', 'content': 'hello world'}}, instance=instance)
@@ -766 +773 @@
->>> instance.delete()
-
-
+# 
-
->>> f = TextFileForm(data={'description': u'Assistance'})
@@ -783 +790 @@
-u'.../test3.txt'
->>> instance.delete()
+
+# ImageField ###################################################################
+
+# ImageField and FileField are nearly identical, but they differ slighty when
+# it comes to validation. This specifically tests that #6302 is fixed for
+# both file fields and image fields.
+
+>>> class ImageFileForm(ModelForm):
+...     class Meta:
+...         model = ImageFile
+
+>>> image_data = open(os.path.join(os.path.dirname(__file__), "test.png")).read()
+
+>>> f = ImageFileForm(data={'description': u'An image'}, files={'image': {'filename': 'test.png', 'content': image_data}})
+>>> f.is_valid()
+True
+>>> type(f.cleaned_data['image'])
+<class 'django.newforms.fields.UploadedFile'>
+>>> instance = f.save()
+>>> instance.image
+u'.../test.png'
+
+# Edit an instance that already has the image defined in the model. This will not
+# save the image again, but leave it exactly as it is.
+
+>>> f = ImageFileForm(data={'description': u'Look, it changed'}, instance=instance)
+>>> f.is_valid()
+True
+>>> f.cleaned_data['image']
+u'.../test.png'
+>>> instance = f.save()
+>>> instance.image
+u'.../test.png'
+
+# Delete the current image since this is not done by Django.
+
+>>> os.unlink(instance.get_image_filename())
+
+# Override the file by uploading a new one.
+
+>>> f = ImageFileForm(data={'description': u'Changed it'}, files={'image': {'filename': 'test2.png', 'content': image_data}}, instance=instance)
+>>> f.is_valid()
+True
+>>> instance = f.save()
+>>> instance.image
+u'.../test2.png'
+
+>>> instance.delete()
+
+# Test the non-required ImageField
+
+>>> f = ImageFileForm(data={'description': u'Test'})
+>>> f.fields['image'].required = False
+>>> f.is_valid()
+True
+>>> instance = f.save()
+>>> instance.image
+''
+
+>>> f = ImageFileForm(data={'description': u'And a final one'}, files={'image': {'filename': 'test3.png', 'content': image_data}}, instance=instance)
+>>> f.is_valid()
+True
+>>> instance = f.save()
+>>> instance.image
+u'.../test3.png'
+>>> instance.delete()
+
-"""}