8000 Doc build fixes by mdboom · Pull Request #5288 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Doc build fixes #5288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 22, 2015
Merged

Doc build fixes #5288

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c30b74e
Don't use cursive and fantasy in font demo
mdboom Oct 20, 2015
bf008b0
User should install Pillow to get PIL
mdboom Oct 20, 2015
7edc583
PIL -> Pillow in docs and error messages
mdboom Oct 20, 2015
bf28ffd
Revert removal of cursive and fantasy
mdboom Oct 20, 2015
711c5b6
Capitalize Pillow
mdboom Oct 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
PIL -> Pillow in docs and error messages
  • Loading branch information
@mdboom
mdboom committed Oct 20, 2015
commit 7edc58338cbed8ce9f8845018bbbc3738b048d6a
6 changes: 3 additions & 3 deletions lib/matplotlib/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should use https since it redirects there anyway.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a fan of using https in external links where not strictly necessary.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the extra GET and redirect not reason enough?

8000

*thumbfile*
the thumbnail filename
Expand Down
4 changes: 2 additions & 2 deletions lib/matplotlib/widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0