[Python-checkins] bpo-33297: Mention Pillow to work with more image formats. (GH-6505)

Sat Apr 21 09:03:59 EDT 2018

https://github.com/python/cpython/commit/f9005030fee6af333fada014da3eb0144078779f
commit: f9005030fee6af333fada014da3eb0144078779f
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2018年04月21日T06:03:49-07:00
summary:
bpo-33297: Mention Pillow to work with more image formats. (GH-6505)
Also update PIL doc references to Pillow.
(cherry picked from commit b81ca28b378c8b29204a37f8bd433a3379f53f7d)
Co-authored-by: Andrés Delfino <34587441+andresdelfino at users.noreply.github.com>
files:
M Doc/distutils/introduction.rst
M Doc/library/tkinter.rst
M Doc/tutorial/modules.rst

diff --git a/Doc/distutils/introduction.rst b/Doc/distutils/introduction.rst
index 8f46bd74c5b0..a38555910361 100644
--- a/Doc/distutils/introduction.rst
+++ b/Doc/distutils/introduction.rst
@@ -193,8 +193,8 @@ modules using the Distutils:
 module distribution
 a collection of Python modules distributed together as a single downloadable
 resource and meant to be installed *en masse*. Examples of some well-known
- module distributions are NumPy, SciPy, PIL (the Python Imaging
- Library), or mxBase. (This would be called a *package*, except that term is
+ module distributions are NumPy, SciPy, Pillow,
+ or mxBase. (This would be called a *package*, except that term is
 already taken in the Python context: a single module distribution may contain
 zero, one, or many Python packages.)
 
diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index b99dc8ec2762..a6a2e473d3d6 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -800,6 +800,10 @@ reference to the image. When the last Python reference to the image object is
 deleted, the image data is deleted as well, and Tk will display an empty box
 wherever the image was used.
 
+.. seealso::
+
+ The `Pillow <http://python-pillow.org/>`_ package adds support for
+ formats such as BMP, JPEG, TIFF, and WebP, among others.
 
 .. _tkinter-file-handlers:
 
diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
index 584d4fd72ea8..3f689327a0c7 100644
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -382,7 +382,7 @@ module names". For example, the module name :mod:`A.B` designates a submodule
 named ``B`` in a package named ``A``. Just like the use of modules saves the
 authors of different modules from having to worry about each other's global
 variable names, the use of dotted module names saves the authors of multi-module
-packages like NumPy or the Python Imaging Library from having to worry about
+packages like NumPy or Pillow from having to worry about
 each other's module names.
 
 Suppose you want to design a collection of modules (a "package") for the uniform
