From f36ca807658492a3fa2e896c3ee4ce69bc1af09a Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sat, 15 Jan 2011 11:43:36 +0100
Subject: [PATCH] #599: Import PIL as ``from PIL import Image``.

---
 CHANGES                | 2 ++
 sphinx/writers/html.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 1fbdd0be5..2ab38c862 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 Release 1.0.7 (in development)
 ==============================
 
+* #599: Import PIL as ``from PIL import Image``.
+
 * #558: Fix longtables with captions in LaTeX output.
 
 * Make token references work as hyperlinks again in LaTeX output.
diff --git a/sphinx/writers/html.py b/sphinx/writers/html.py
index f1c4d596d..85c653602 100644
--- a/sphinx/writers/html.py
+++ b/sphinx/writers/html.py
@@ -21,7 +21,7 @@ from sphinx.locale import admonitionlabels, versionlabels, _
 from sphinx.util.smartypants import sphinx_smarty_pants
 
 try:
-    import Image                        # check for the Python Imaging Library
+    from PIL import Image        # check for the Python Imaging Library
 except ImportError:
     Image = None