summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-07-12 03:44:34 -0700
committerTim Graham <timograham@gmail.com>2013-07-12 03:44:34 -0700
commitb82a2c41387648f81387b1e03371331db3630269 (patch)
tree4c55840b7b8789795faa8b672bf10c48c8f91e68
parent3cdeb572d73fca3d7966318c760f61ba73e5ad5f (diff)
parentb4c61c2665c0aa06dcdc4f823be03f23b9696408 (diff)
Merge pull request #1349 from chrismedrela/ticket19934-comment
Added clarification comments to django.utils.image; refs #19934
-rw-r--r--django/utils/image.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/django/utils/image.py b/django/utils/image.py
index 2fd0c6e6b0..dd2fab6197 100644
--- a/django/utils/image.py
+++ b/django/utils/image.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""
To provide a shim layer over Pillow/PIL situation until the PIL support is
-removed.
+removed. See #19934.
Combinations To Account For
@@ -132,6 +132,8 @@ def _detect_image_library():
try:
from PIL import ImageFile as PILImageFile
except ImportError:
+ # This import cannot fail unless Pillow/PIL install is completely
+ # broken (e.g. missing Python modules).
import ImageFile as PILImageFile
# Finally, warn about deprecation...