summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-04-21 13:04:08 (GMT)
committerGitHub <noreply@github.com>2018-04-21 13:04:08 (GMT)
commit5c0a8bb1c2c8d77c4b2d5002259d08fe6a277b40 (patch)
tree3fde51af8ef287e50c4a8593486e913c33500414
parent82de43fdd5e31fcf31b70b6f9a7d3dd1b9f91537 (diff)
downloadcpython-5c0a8bb1c2c8d77c4b2d5002259d08fe6a277b40.zip
cpython-5c0a8bb1c2c8d77c4b2d5002259d08fe6a277b40.tar.gz
cpython-5c0a8bb1c2c8d77c4b2d5002259d08fe6a277b40.tar.bz2
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@users.noreply.github.com>
-rw-r--r--Doc/distutils/introduction.rst4
-rw-r--r--Doc/library/tkinter.rst4
-rw-r--r--Doc/tutorial/modules.rst2
3 files changed, 7 insertions, 3 deletions
diff --git a/Doc/distutils/introduction.rst b/Doc/distutils/introduction.rst
index 8f46bd7..a385559 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 d6e33eb..8707a53 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 8c26318..a4c766e 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