python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-11-13 05:06:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into rm-3.6

Browse Source
This commit is contained in:
Hugo van Kemenade 2021-10-25 12:05:05 +03:00 committed by GitHub
commit 36eb97d3c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.rst
View File

@ -5,6 +5,9 @@ Changelog (Pillow)
9.0.0 (unreleased) 9.0.0 (unreleased)
------------------ ------------------
- Use title for display in ImageShow #5788
[radarhere]
- Remove support for FreeType 2.7 and older #5777 - Remove support for FreeType 2.7 and older #5777
[hugovk, radarhere] [hugovk, radarhere]
@ -389,7 +392,7 @@ Changelog (Pillow)
- Changed Image.open formats parameter to be case-insensitive #5250 - Changed Image.open formats parameter to be case-insensitive #5250
[Piolie, radarhere] [Piolie, radarhere]
- Deprecate Tk/Tcl 8.4, to be removed in Pillow 10 (2023-01-02) #5216 - Deprecate Tk/Tcl 8.4, to be removed in Pillow 10 (2023-07-01) #5216
[radarhere] [radarhere]
- Added tk version to pilinfo #5226 - Added tk version to pilinfo #5226

8
docs/deprecations.rst
View File

@ -17,7 +17,7 @@ Tk/Tcl 8.4
.. deprecated:: 8.2.0 .. deprecated:: 8.2.0
Support for Tk/Tcl 8.4 is deprecated and will be removed in Pillow 10.0.0 (2023-01-02), Support for Tk/Tcl 8.4 is deprecated and will be removed in Pillow 10.0.0 (2023-07-01),
when Tk/Tcl 8.5 will be the minimum supported. when Tk/Tcl 8.5 will be the minimum supported.
Categories Categories
@ -25,7 +25,7 @@ Categories
.. deprecated:: 8.2.0 .. deprecated:: 8.2.0
``im.category`` is deprecated and will be removed in Pillow 10.0.0 (2023-01-02), ``im.category`` is deprecated and will be removed in Pillow 10.0.0 (2023-07-01),
along with the related ``Image.NORMAL``, ``Image.SEQUENCE`` and along with the related ``Image.NORMAL``, ``Image.SEQUENCE`` and
``Image.CONTAINER`` attributes. ``Image.CONTAINER`` attributes.
@ -40,14 +40,14 @@ JpegImagePlugin.convert_dict_qtables
JPEG ``quantization`` is now automatically converted, but still returned as a JPEG ``quantization`` is now automatically converted, but still returned as a
dictionary. The :py:attr:`~PIL.JpegImagePlugin.convert_dict_qtables` method no longer dictionary. The :py:attr:`~PIL.JpegImagePlugin.convert_dict_qtables` method no longer
performs any operations on the data given to it, has been deprecated and will be performs any operations on the data given to it, has been deprecated and will be
removed in Pillow 10.0.0 (2023-01-02). removed in Pillow 10.0.0 (2023-07-01).
ImagePalette size parameter ImagePalette size parameter
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. deprecated:: 8.4.0 .. deprecated:: 8.4.0
The ``size`` parameter will be removed in Pillow 10.0.0 (2023-01-02). The ``size`` parameter will be removed in Pillow 10.0.0 (2023-07-01).
Before Pillow 8.3.0, ``ImagePalette`` required palette data of particular lengths by Before Pillow 8.3.0, ``ImagePalette`` required palette data of particular lengths by
default, and the size parameter could be used to override that. Pillow 8.3.0 removed default, and the size parameter could be used to override that. Pillow 8.3.0 removed

4
docs/releasenotes/8.2.0.rst
View File

@ -7,7 +7,7 @@ Deprecations
Categories Categories
^^^^^^^^^^ ^^^^^^^^^^
``im.category`` is deprecated and will be removed in Pillow 10.0.0 (2023-01-02), ``im.category`` is deprecated and will be removed in Pillow 10.0.0 (2023-07-01),
along with the related ``Image.NORMAL``, ``Image.SEQUENCE`` and along with the related ``Image.NORMAL``, ``Image.SEQUENCE`` and
``Image.CONTAINER`` attributes. ``Image.CONTAINER`` attributes.
@ -17,7 +17,7 @@ To determine if an image has multiple frames or not,
Tk/Tcl 8.4 Tk/Tcl 8.4
^^^^^^^^^^ ^^^^^^^^^^
Support for Tk/Tcl 8.4 is deprecated and will be removed in Pillow 10.0.0 (2023-01-02), Support for Tk/Tcl 8.4 is deprecated and will be removed in Pillow 10.0.0 (2023-07-01),
when Tk/Tcl 8.5 will be the minimum supported. when Tk/Tcl 8.5 will be the minimum supported.
API Changes API Changes

2
docs/releasenotes/8.3.0.rst
View File

@ -10,7 +10,7 @@ JpegImagePlugin.convert_dict_qtables
JPEG ``quantization`` is now automatically converted, but still returned as a JPEG ``quantization`` is now automatically converted, but still returned as a
dictionary. The :py:attr:`~PIL.JpegImagePlugin.convert_dict_qtables` method no longer dictionary. The :py:attr:`~PIL.JpegImagePlugin.convert_dict_qtables` method no longer
performs any operations on the data given to it, has been deprecated and will be performs any operations on the data given to it, has been deprecated and will be
removed in Pillow 10.0.0 (2023-01-02). removed in Pillow 10.0.0 (2023-07-01).
API Changes API Changes
=========== ===========

2
docs/releasenotes/8.4.0.rst
View File

@ -10,7 +10,7 @@ Deprecations
ImagePalette size parameter ImagePalette size parameter
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
The ``size`` parameter will be removed in Pillow 10.0.0 (2023-01-02). The ``size`` parameter will be removed in Pillow 10.0.0 (2023-07-01).
Before Pillow 8.3.0, ``ImagePalette`` required palette data of particular lengths by Before Pillow 8.3.0, ``ImagePalette`` required palette data of particular lengths by
default, and the size parameter could be used to override that. Pillow 8.3.0 removed default, and the size parameter could be used to override that. Pillow 8.3.0 removed

10
docs/releasenotes/9.0.0.rst
View File

@ -63,10 +63,14 @@ TODO
API Additions API Additions
============= =============
TODO Added support for "title" argument to DisplayViewer
^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
TODO Support has been added for the "title" argument in
:py:class:`~PIL.ImageShow.UnixViewer.DisplayViewer`, so that when ``im.show()`` or
:py:func:`.ImageShow.show()` use the ``display`` command line tool, the "title"
argument will also now be supported, e.g. ``im.show(title="My Image")`` and
``ImageShow.show(im, title="My Image")``.
Security Security
======== ========

4
src/PIL/Image.py
View File

@ -57,7 +57,7 @@ def __getattr__(name):
if name in categories: if name in categories:
warnings.warn( warnings.warn(
"Image categories are deprecated and will be removed in Pillow 10 " "Image categories are deprecated and will be removed in Pillow 10 "
"(2023-01-02). Use is_animated instead.", "(2023-07-01). Use is_animated instead.",
DeprecationWarning, DeprecationWarning,
stacklevel=2, stacklevel=2,
) )
@ -513,7 +513,7 @@ class Image:
if name == "category": if name == "category":
warnings.warn( warnings.warn(
"Image categories are deprecated and will be removed in Pillow 10 " "Image categories are deprecated and will be removed in Pillow 10 "
"(2023-01-02). Use is_animated instead.", "(2023-07-01). Use is_animated instead.",
DeprecationWarning, DeprecationWarning,
stacklevel=2, stacklevel=2,
) )

2
src/PIL/ImagePalette.py
View File

@ -44,7 +44,7 @@ class ImagePalette:
if size != 0: if size != 0:
warnings.warn( warnings.warn(
"The size parameter is deprecated and will be removed in Pillow 10 " "The size parameter is deprecated and will be removed in Pillow 10 "
"(2023-01-02).", "(2023-07-01).",
DeprecationWarning, DeprecationWarning,
) )
if size != len(self.palette): if size != len(self.palette):

9
src/PIL/ImageShow.py
View File

@ -187,10 +187,15 @@ class UnixViewer(Viewer):
class DisplayViewer(UnixViewer): class DisplayViewer(UnixViewer):
"""The ImageMagick ``display`` command.""" """
The ImageMagick ``display`` command.
This viewer supports the ``title`` parameter.
"""
def get_command_ex(self, file, **options): def get_command_ex(self, file, title=None, **options):
command = executable = "display" command = executable = "display"
if title:
command += f" -name {quote(title)}"
return command, executable return command, executable

2
src/PIL/JpegImagePlugin.py
View File

@ -603,7 +603,7 @@ samplings = {
def convert_dict_qtables(qtables): def convert_dict_qtables(qtables):
warnings.warn( warnings.warn(
"convert_dict_qtables is deprecated and will be removed in Pillow 10" "convert_dict_qtables is deprecated and will be removed in Pillow 10"
"(2023-01-02). Conversion is no longer needed.", "(2023-07-01). Conversion is no longer needed.",
DeprecationWarning, DeprecationWarning,
) )
return qtables return qtables

2
src/PIL/_tkinter_finder.py
View File

@ -14,7 +14,7 @@ tk_version = str(tkinter.TkVersion)
if tk_version == "8.4": if tk_version == "8.4":
warnings.warn( warnings.warn(
"Support for Tk/Tcl 8.4 is deprecated and will be removed" "Support for Tk/Tcl 8.4 is deprecated and will be removed"
" in Pillow 10 (2023-01-02). Please upgrade to Tk/Tcl 8.5 " " in Pillow 10 (2023-07-01). Please upgrade to Tk/Tcl 8.5 "
"or newer.", "or newer.",
DeprecationWarning, DeprecationWarning,
) )