From 750f5c8d464f79a5b502cf67b42e59196dc92742 Mon Sep 17 00:00:00 2001 From: Jacob Kaplan-Moss Date: Sat, 9 Aug 2008 14:18:09 +0000 Subject: [PATCH] Fixed #8187: made PIL imports consistant. Thanks, bastih. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8257 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/modeltests/model_forms/models.py | 2 +- tests/regressiontests/file_storage/models.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/modeltests/model_forms/models.py b/tests/modeltests/model_forms/models.py index 3463cb7554..8ab264dae2 100644 --- 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 index 8cd8b9e56c..df99045352 100644 --- a/tests/regressiontests/file_storage/models.py +++ b/tests/regressiontests/file_storage/models.py @@ -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