Skip to content

Commit

Permalink
[2.7] bpo-33297: Mention Pillow to work with more image formats. (GH-…
Browse files Browse the repository at this point in the history
…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'
  • Loading branch information
andresdelfino authored and serhiy-storchaka committed Apr 21, 2018
1 parent 4caba7a commit b9827b7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Doc/distutils/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.)

Expand Down
4 changes: 4 additions & 0 deletions Doc/library/tkinter.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion Doc/tutorial/modules.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b9827b7

Please sign in to comment.