From f03a5b3a76be476cf1a39f977631d27e8b8d081f Mon Sep 17 00:00:00 2001 From: Michael Droettboom Date: Wed, 21 Oct 2015 20:10:11 -0400 Subject: [PATCH] Merge pull request #5288 from mdboom/doc-build-fixes Doc build fixes --- examples/pylab_examples/agg_buffer.py | 2 +- lib/matplotlib/image.py | 6 +++--- lib/matplotlib/widgets.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/pylab_examples/agg_buffer.py b/examples/pylab_examples/agg_buffer.py index 3f1fb1dc7980..1293c723cb8c 100755 --- 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 index 272b406083e1..188d991981a6 100644 --- 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 `_ installed + *infile* the image file -- must be PNG or Pillow-readable if you + have `Pillow `_ installed *thumbfile* the thumbnail filename diff --git a/lib/matplotlib/widgets.py b/lib/matplotlib/widgets.py index ab2331e0b0e4..94042a59e3bf 100644 --- 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