Commit 750f5c8d authored by Jacob Kaplan-Moss's avatar Jacob Kaplan-Moss
Browse files

Fixed #8187: made PIL imports consistant. Thanks, bastih. 


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 6a06db04

tests/modeltests/model_forms/models.py

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ class ImageFile(models.Model): 
        # Checking for the existence of Image is enough for CPython, but

        # for PyPy, you need to check for the underlying modules

        # If PIL is not available, this test is equivalent to TextFile above.

        import Image, _imaging

        from PIL import Image, _imaging

        image = models.ImageField(storage=temp_storage, upload_to='tests')

    except ImportError:

        image = models.FileField(storage=temp_storage, upload_to='tests')

tests/regressiontests/file_storage/models.py

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ temp_storage = FileSystemStorage(tempfile.gettempdir()) 
try:

    # Checking for the existence of Image is enough for CPython, but

    # for PyPy, you need to check for the underlying modules

    import Image, _imaging

    from PIL import Image, _imaging

except ImportError:

    Image = None