From 4965a774074780f3e4858bcc975476f71edf2c2c Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Fri, 21 Mar 2014 10:54:53 -0400 Subject: Removed PIL compatability layer per deprecation timeline. refs #19934. --- tests/model_forms/models.py | 6 +++--- tests/model_forms/tests.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/model_forms') diff --git a/tests/model_forms/models.py b/tests/model_forms/models.py index 59b18dc39d..28feaa97cc 100644 --- a/tests/model_forms/models.py +++ b/tests/model_forms/models.py @@ -13,7 +13,7 @@ import os import tempfile from django.core import validators -from django.core.exceptions import ImproperlyConfigured, ValidationError +from django.core.exceptions import ValidationError from django.core.files.storage import FileSystemStorage from django.db import models from django.utils import six @@ -154,7 +154,7 @@ class FilePathModel(models.Model): try: - from django.utils.image import Image # NOQA: detect if Pillow is installed + from PIL import Image # NOQA: detect if Pillow is installed test_images = True @@ -193,7 +193,7 @@ try: def __str__(self): return self.description -except ImproperlyConfigured: +except ImportError: test_images = False diff --git a/tests/model_forms/tests.py b/tests/model_forms/tests.py index 468f83686e..4504ecb91d 100644 --- a/tests/model_forms/tests.py +++ b/tests/model_forms/tests.py @@ -1852,7 +1852,7 @@ class FileAndImageFieldTests(TestCase): names.sort() self.assertEqual(names, ['---------', '__init__.py', 'models.py', 'tests.py']) - @skipUnless(test_images, "Pillow/PIL not installed") + @skipUnless(test_images, "Pillow not installed") def test_image_field(self): # ImageField and FileField are nearly identical, but they differ slighty when # it comes to validation. This specifically tests that #6302 is fixed for -- cgit v1.3