Commits

Anonymous committed f3bc2be

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

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

  • Participants
  • Parent commits 1a24ca5

Comments (0)

Files changed (2)

tests/modeltests/model_forms/models.py

         # 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

 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