mirrors
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues 24 Releases Wiki Activity

Merge pull request #1349 from chrismedrela/ticket19934-comment 

Added clarification comments to django.utils.image; refs #19934
This commit is contained in:
Tim Graham 2013-07-12 03:44:34 -07:00
parent 3cdeb572d7 b4c61c2665
commit b82a2c4138
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/utils/image.py
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
""" """
To provide a shim layer over Pillow/PIL situation until the PIL support is To provide a shim layer over Pillow/PIL situation until the PIL support is
removed. removed. See #19934.
Combinations To Account For Combinations To Account For
@ -132,6 +132,8 @@ def _detect_image_library():
try: try:
from PIL import ImageFile as PILImageFile from PIL import ImageFile as PILImageFile
except ImportError: except ImportError:
# This import cannot fail unless Pillow/PIL install is completely
# broken (e.g. missing Python modules).
import ImageFile as PILImageFile import ImageFile as PILImageFile
# Finally, warn about deprecation... # Finally, warn about deprecation...