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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
dcramer · Aug 9, 2008 · 9224b42 · 9224b42
1 parent d958db1
commit 9224b42
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/modeltests/model_forms/models.py b/tests/modeltests/model_forms/models.py
@@ -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')

diff --git a/tests/regressiontests/file_storage/models.py b/tests/regressiontests/file_storage/models.py
@@ -12,7 +12,7 @@
 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