Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #8196 -- Make the model_form tests also pass if you don't have PIL

installed. We weren't relying on PIL previously, but the output was different
if it wasn't installed, which was triggering spurious failures. Patch from
Marty Alchin.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit c435975cc779a4549591a1c2b32e91f409c33757 1 parent 63c9b7b
@malcolmt malcolmt authored
Showing with 9 additions and 9 deletions.
  1. +9 −9 tests/modeltests/model_forms/models.py
View
18 tests/modeltests/model_forms/models.py
@@ -1030,7 +1030,7 @@ def __unicode__(self):
<class 'django.core.files.uploadedfile.SimpleUploadedFile'>
>>> instance = f.save()
>>> instance.image
-<ImageFieldFile: tests/test.png>
+<...FieldFile: tests/test.png>
# Delete the current file since this is not done by Django.
>>> instance.image.delete()
@@ -1042,7 +1042,7 @@ def __unicode__(self):
<class 'django.core.files.uploadedfile.SimpleUploadedFile'>
>>> instance = f.save()
>>> instance.image
-<ImageFieldFile: tests/test.png>
+<...FieldFile: tests/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.
@@ -1051,10 +1051,10 @@ def __unicode__(self):
>>> f.is_valid()
True
>>> f.cleaned_data['image']
-<ImageFieldFile: tests/test.png>
+<...FieldFile: tests/test.png>
>>> instance = f.save()
>>> instance.image
-<ImageFieldFile: tests/test.png>
+<...FieldFile: tests/test.png>
# Delete the current image since this is not done by Django.
@@ -1067,7 +1067,7 @@ def __unicode__(self):
True
>>> instance = f.save()
>>> instance.image
-<ImageFieldFile: tests/test2.png>
+<...FieldFile: tests/test2.png>
# Delete the current file since this is not done by Django.
>>> instance.image.delete()
@@ -1078,7 +1078,7 @@ def __unicode__(self):
True
>>> instance = f.save()
>>> instance.image
-<ImageFieldFile: tests/test2.png>
+<...FieldFile: tests/test2.png>
# Delete the current file since this is not done by Django.
>>> instance.image.delete()
@@ -1092,14 +1092,14 @@ def __unicode__(self):
True
>>> instance = f.save()
>>> instance.image
-<ImageFieldFile: None>
+<...FieldFile: None>
>>> f = ImageFileForm(data={'description': u'And a final one'}, files={'image': SimpleUploadedFile('test3.png', image_data)}, instance=instance)
>>> f.is_valid()
True
>>> instance = f.save()
>>> instance.image
-<ImageFieldFile: tests/test3.png>
+<...FieldFile: tests/test3.png>
# Delete the current file since this is not done by Django.
>>> instance.image.delete()
@@ -1110,7 +1110,7 @@ def __unicode__(self):
True
>>> instance = f.save()
>>> instance.image
-<ImageFieldFile: tests/test3.png>
+<...FieldFile: tests/test3.png>
>>> instance.delete()
# Media on a ModelForm ########################################################
Please sign in to comment.
Something went wrong with that request. Please try again.