Merge pull request #5216 from radarhere/tk

Deprecate Tk/Tcl 8.4, to be removed in Pillow 10 (2023-01-02)
This commit is contained in:
Hugo van Kemenade 2021-02-02 15:00:15 +02:00 committed by GitHub
commit 54f12f8aad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 57 additions and 0 deletions

View File

@ -25,6 +25,14 @@ vulnerability introduced in FreeType 2.6 (:cve:`CVE-2020-15999`).
.. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/ .. _2.10.4: https://sourceforge.net/projects/freetype/files/freetype2/2.10.4/
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),
when Tk/Tcl 8.5 will be the minimum supported.
Image.show command parameter Image.show command parameter
~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

View File

@ -0,0 +1,40 @@
8.2.0
-----
Deprecations
============
Tk/Tcl 8.4
^^^^^^^^^^
Support for Tk/Tcl 8.4 is deprecated and will be removed in Pillow 10.0.0 (2023-01-02),
when Tk/Tcl 8.5 will be the minimum supported.
API Changes
===========
TODO
^^^^
TODO
API Additions
=============
TODO
^^^^
TODO
Security
========
TODO
Other Changes
=============
TODO
^^^^
TODO

View File

@ -14,6 +14,7 @@ expected to be backported to earlier versions.
.. toctree:: .. toctree::
:maxdepth: 2 :maxdepth: 2
8.2.0
8.1.0 8.1.0
8.0.1 8.0.1
8.0.0 8.0.0

View File

@ -2,6 +2,7 @@
""" """
import sys import sys
import tkinter import tkinter
import warnings
from tkinter import _tkinter as tk from tkinter import _tkinter as tk
if hasattr(sys, "pypy_find_executable"): if hasattr(sys, "pypy_find_executable"):
@ -10,3 +11,10 @@ else:
TKINTER_LIB = tk.__file__ TKINTER_LIB = tk.__file__
tk_version = str(tkinter.TkVersion) 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 "
"or newer.",
DeprecationWarning,
)