Merge pull request #5288 from mdboom/doc-build-fixes

mdboom · mdboom · commit f03a5b3a76be · 2015-10-21T20:10:50.000-04:00
Doc build fixes
diff --git a/examples/pylab_examples/agg_buffer.py b/examples/pylab_examples/agg_buffer.py
@@ -13,7 +13,7 @@
 try:
     from PIL import Image
 except ImportError:
-    raise SystemExit("PIL must be installed to run this example")
+    raise SystemExit("Pillow must be installed to run this example")
 
 plt.plot([1, 2, 3])
 
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -1304,7 +1304,7 @@ def pilread(fname):
         im = pilread(fname)
         if im is None:
             raise ValueError('Only know how to handle extensions: %s; '
-                             'with PIL installed matplotlib can handle '
+                             'with Pillow installed matplotlib can handle '
                              'more images' % list(six.iterkeys(handlers)))
         return im
 
@@ -1427,8 +1427,8 @@ def thumbnail(infile, thumbfile, scale=0.1, interpolation='bilinear',
     make a thumbnail of image in *infile* with output filename
     *thumbfile*.
 
-      *infile* the image file -- must be PNG or PIL readable if you
-         have `PIL <http://www.pythonware.com/products/pil/>`_ installed
+      *infile* the image file -- must be PNG or Pillow-readable if you
+         have `Pillow <http://python-pillow.github.io/>`_ installed
 
       *thumbfile*
         the thumbnail filename
diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py
@@ -171,10 +171,10 @@ def __init__(self, ax, label, image=None,
         label : str
             The button text. Accepts string.
 
-        image : array, mpl image, PIL image
+        image : array, mpl image, Pillow Image
             The image to place in the button, if not *None*.
             Can be any legal arg to imshow (numpy array,
-            matplotlib Image instance, or PIL image).
+            matplotlib Image instance, or Pillow Image).
 
         color : color
             The color of the button when not activated
