Merged revisions 8939 via svnmerge from

mdboom · mdboom · commit aabb2756671b · 2011-02-01T16:26:25.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint ........ r8939 | mdboom | 2011-02-01 11:02:54 -0500 (Tue, 01 Feb 2011) | 1 line [3167200] Use from PIL import Image ........ svn path=/trunk/matplotlib/; revision=8942
diff --git a/examples/pylab_examples/image_demo3.py b/examples/pylab_examples/image_demo3.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from pylab import *
 try:
-    import Image
+    from PIL import Image
 except ImportError, exc:
     raise SystemExit("PIL must be installed to run this example")
 
diff --git a/examples/pylab_examples/to_numeric.py b/examples/pylab_examples/to_numeric.py
@@ -8,7 +8,7 @@
 from pylab import *
 from matplotlib.backends.backend_agg import FigureCanvasAgg
 try:
-    import Image
+    from PIL import Image
 except ImportError, exc:
     raise SystemExit("PIL must be installed to run this example")
 
diff --git a/examples/user_interfaces/histogram_demo_canvasagg.py b/examples/user_interfaces/histogram_demo_canvasagg.py
@@ -54,7 +54,7 @@
 
 if 0:
     # pass off to PIL
-    import Image
+    from PIL import Image
     im = Image.fromstring( "RGB", (w,h), s)
     im.show()
 
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -49,7 +49,7 @@
 from matplotlib.path import Path
 
 try:
-    import Image
+    from PIL import Image
     _has_pil = True
 except ImportError:
     _has_pil = False
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -1157,7 +1157,7 @@ def imread(fname, format=None):
 
     def pilread():
         'try to load the image with PIL or return None'
-        try: import Image
+        try: from PIL import Image
         except ImportError: return None
         image = Image.open( fname )
         return pil_to_array(image)
