Skip to content
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
  • Loading branch information...
1 parent 6a06db0 commit 750f5c8d464f79a5b502cf67b42e59196dc92742 @jacobian jacobian committed
Showing with 2 additions and 2 deletions.
  1. +1 −1 tests/modeltests/model_forms/models.py
  2. +1 −1 tests/regressiontests/file_storage/models.py
View
2 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')
View
2 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

0 comments on commit 750f5c8

Please sign in to comment.
Something went wrong with that request. Please try again.