Merge branch 'main' into rm-3.6

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

View File

@ -5,6 +5,9 @@ Changelog (Pillow)
9.0.0 (unreleased)
------------------
- Use title for display in ImageShow #5788
[radarhere]
- Remove support for FreeType 2.7 and older #5777
[hugovk, radarhere]
@ -389,7 +392,7 @@ Changelog (Pillow)
- Changed Image.open formats parameter to be case-insensitive #5250
[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]
- Added tk version to pilinfo #5226

View File

@ -17,7 +17,7 @@ Tk/Tcl 8.4
.. 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.
Categories
@ -25,7 +25,7 @@ Categories
.. 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
``Image.CONTAINER`` attributes.
@ -40,14 +40,14 @@ JpegImagePlugin.convert_dict_qtables
JPEG ``quantization`` is now automatically converted, but still returned as a
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
removed in Pillow 10.0.0 (2023-01-02).
removed in Pillow 10.0.0 (2023-07-01).
ImagePalette size parameter
~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. 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
default, and the size parameter could be used to override that. Pillow 8.3.0 removed

View File

@ -7,7 +7,7 @@ Deprecations
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
``Image.CONTAINER`` attributes.
@ -17,7 +17,7 @@ To determine if an image has multiple frames or not,
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.
API Changes

View File

@ -10,7 +10,7 @@ JpegImagePlugin.convert_dict_qtables
JPEG ``quantization`` is now automatically converted, but still returned as a
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
removed in Pillow 10.0.0 (2023-01-02).
removed in Pillow 10.0.0 (2023-07-01).
API Changes
===========

View File

@ -10,7 +10,7 @@ Deprecations
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
default, and the size parameter could be used to override that. Pillow 8.3.0 removed

View File

@ -63,10 +63,14 @@ TODO
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
========

View File

@ -57,7 +57,7 @@ def __getattr__(name):
if name in categories:
warnings.warn(
"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,
stacklevel=2,
)
@ -513,7 +513,7 @@ class Image:
if name == "category":
warnings.warn(
"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,
stacklevel=2,
)

View File

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

View File

@ -187,10 +187,15 @@ class UnixViewer(Viewer):
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"
if title:
command += f" -name {quote(title)}"
return command, executable

View File

@ -603,7 +603,7 @@ samplings = {
def convert_dict_qtables(qtables):
warnings.warn(
"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,
)
return qtables

View File

@ -14,7 +14,7 @@ tk_version = str(tkinter.TkVersion)
if tk_version == "8.4":
warnings.warn(
"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.",
DeprecationWarning,
)