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

Also update PIL doc references to Pillow.
(cherry picked from commit 'b81ca28b378c8b29204a37f8bd433a3379f53f7d')

Co-authored-by: 'Andrés Delfino.34587441+andresdelfino@users.noreply.github.com'

diff --git a/Doc/distutils/introduction.rst b/Doc/distutils/introduction.rst
index fc6184fa5750048c8d589d497391ede8300426e2..5229e6429ddff1a581216ffa8359ea71c08a5c2d 100644 (file)
--- 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 Numeric Python, PyXML, PIL (the Python Imaging
-   Library), or mxBase.  (This would be called a *package*, except that term is
+   module distributions are Numeric Python, PyXML, 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 7d80b40fdf52e82c785a78cc537c4f8851c83d69..5e07051168e8cab08405cec19b57ad8e467ea095 100644 (file)
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -818,6 +818,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 ec3bd9c53d2ec6ce03bd49c2f2fb018267ba146f..042d23306bdd32ef4a1b1edb2448b7af8365fcce 100644 (file)
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -377,7 +377,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