diff options
| author | Florian Apolloner <florian@apolloner.eu> | 2013-05-15 09:00:09 +0200 |
|---|---|---|
| committer | Florian Apolloner <florian@apolloner.eu> | 2013-05-15 09:00:09 +0200 |
| commit | 4ecc6da20b00b2d00a8cc158056a10bf0a259d07 (patch) | |
| tree | c298b7074c557dab1d6c62cb62420a0aa3343dcd /django | |
| parent | 33793f7c3edd8ff144ff2e9434367267c20af26a (diff) | |
Removed unicode literals from PIL compat.
Diffstat (limited to 'django')
| -rw-r--r-- | django/utils/image.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/django/utils/image.py b/django/utils/image.py index ed9b210973..54c11adfee 100644 --- a/django/utils/image.py +++ b/django/utils/image.py @@ -67,6 +67,8 @@ Approach * ``ImportError`` - Bad install, toss an exception """ +from __future__ import unicode_literals + import warnings from django.core.exceptions import ImproperlyConfigured @@ -100,12 +102,12 @@ def _detect_image_library(): except ImportError as err: # Neither worked, so it's likely not installed. raise ImproperlyConfigured( - _(u"Neither Pillow nor PIL could be imported: %s" % err) + _("Neither Pillow nor PIL could be imported: %s" % err) ) # ``Image.alpha_composite`` was added to Pillow in SHA: e414c6 & is not # available in any version of the PIL. - if hasattr(PILImage, u'alpha_composite'): + if hasattr(PILImage, 'alpha_composite'): PIL_imaging = False else: # We're dealing with the PIL. Determine if we're on CPython & if @@ -114,7 +116,7 @@ def _detect_image_library(): # This is the Alex Approved™ way. # See http://mail.python.org/pipermail//pypy-dev/2011-November/008739.html - if platform.python_implementation().lower() == u'cpython': + if platform.python_implementation().lower() == 'cpython': # We're on CPython (likely 2.x). Since a C compiler is needed to # produce a fully-working PIL & will create a ``_imaging`` module, # we'll attempt to import it to verify their kit works. @@ -122,8 +124,8 @@ def _detect_image_library(): import _imaging as PIL_imaging except ImportError as err: raise ImproperlyConfigured( - _(u"The '_imaging' module for the PIL could not be " + - u"imported: %s" % err) + _("The '_imaging' module for the PIL could not be " + + "imported: %s" % err) ) # Try to import ImageFile as well. |
