summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshimizukawa <shimizukawa@gmail.com>2012-11-07 07:42:44 +0900
committershimizukawa <shimizukawa@gmail.com>2012-11-07 07:42:44 +0900
commit5a1d21680ca6dfde009d168c51dcca88ea44c941 (patch)
tree403a707760e55360cd3b837197dd7763588d4b6c
parenta7c3d7241f3a07c90a67ef6f7781c9f2a44ea3e5 (diff)
downloadsphinx-5a1d21680ca6dfde009d168c51dcca88ea44c941.tar.gz
Closes #920: rescue PIL packaging issue that allow import `Image` without `PIL` namespace.
Also closes #702.
-rw-r--r--sphinx/writers/html.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py
index 2051e38e..d714ed4f 100644
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -23,7 +23,10 @@ from sphinx.util.smartypants import sphinx_smarty_pants
try:
from PIL import Image # check for the Python Imaging Library
except ImportError:
- Image = None
+ try:
+ import Image
+ except ImportError:
+ Image = None
class HTMLWriter(Writer):