diff options
Diffstat (limited to 'tests/regressiontests/model_fields')
| -rw-r--r-- | tests/regressiontests/model_fields/models.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/regressiontests/model_fields/models.py b/tests/regressiontests/model_fields/models.py index 462e96874b..2fed5195dd 100644 --- a/tests/regressiontests/model_fields/models.py +++ b/tests/regressiontests/model_fields/models.py @@ -6,12 +6,17 @@ try: except ImportError: from django.utils import _decimal as decimal # Python 2.3 fallback +# 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 from django.core.files.storage import FileSystemStorage from django.db import models |