mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #6054: work around PIL's installation brokeness by detecting either of the two ways it can end up being installed.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12429 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jacob Kaplan-Moss
2010-02-14 18:28:28 +00:00
parent e6740cb39c
commit 7578981626
6 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/regressiontests/file_storage/tests.py
View File

@@ -18,12 +18,16 @@ try:
except ImportError:
import dummy_threading as threading
# Try to import PIL in either of the two ways it can end up installed.
# Checking for the existence of Image is enough for CPython, but
# for PyPy, you need to check for the underlying modules
try:
# Checking for the existence of Image is enough for CPython, but
# for PyPy, you need to check for the underlying modules
from PIL import Image, _imaging
except ImportError:
Image = None
try:
import Image, _imaging
except ImportError:
Image = None
class FileStorageTests(unittest.TestCase):
storage_class = FileSystemStorage