Author: mtredinnick
Date: 2008-09-01 22:07:26 -0500 (Mon, 01 Sep 2008)
New Revision: 8842
Modified:
django/trunk/tests/modeltests/model_forms/models.py
Log:
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.
Modified: django/trunk/tests/modeltests/model_forms/models.py
===================================================================
--- django/trunk/tests/modeltests/model_forms/models.py 2008-09-02 03:04:28 UTC
(rev 8841)
+++ django/trunk/tests/modeltests/model_forms/models.py 2008-09-02 03:07:26 UTC
(rev 8842)
@@ -1030,7 +1030,7 @@
<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 @@
<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 @@
>>> 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 @@
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 @@
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 @@
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 @@
True
>>> instance = f.save()
>>> instance.image
-<ImageFieldFile: tests/test3.png>
+<...FieldFile: tests/test3.png>
>>> instance.delete()
# Media on a ModelForm ########################################################
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
