Commit 159d1be6 authored by Claude Paroz's avatar Claude Paroz
Browse files

Fixed #11150 -- Removed dependency on cStringIO in ImageField validation....

Fixed #11150 -- Removed dependency on cStringIO in ImageField validation. Thanks vvd for the report.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17825 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 6cbb96ef
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -577,8 +577,8 @@ class ImageField(FileField):

            # Since we're about to use the file again we have to reset the
            # file object if possible.
            if hasattr(file, 'reset'):
                file.reset()
            if hasattr(file, 'seek') and callable(file.seek):
                file.seek(0)

            # verify() is the only method that can spot a corrupt PNG,
            #  but it must be called immediately after the constructor
+13 −0
Original line number Diff line number Diff line
@@ -1370,6 +1370,19 @@ class OldFormForXTests(TestCase):
        self.assertEqual(instance.image.name, 'foo/test4.png')
        instance.delete()

        # Test image field when cStringIO is not available
        from django.forms import fields
        from StringIO import StringIO
        old_StringIO = fields.StringIO
        fields.StringIO = StringIO
        try:
            f = ImageFileForm(
                data={'description': u'An image'},
                files={'image': SimpleUploadedFile('test.png', image_data)})
            self.assertEqual(f.is_valid(), True)
        finally:
            fields.StringIO = old_StringIO

    def test_media_on_modelform(self):
        # Similar to a regular Form class you can define custom media to be used on
        # the ModelForm.