From cf98f178ad2bb55261a8ea41003ada97e520d306 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 26 Jan 2021 08:01:26 +1100 Subject: [PATCH 1/2] Added tk version --- src/PIL/_tkinter_finder.py | 3 +++ src/PIL/features.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/PIL/_tkinter_finder.py b/src/PIL/_tkinter_finder.py index 7018a1b79a9..7463595358f 100644 --- a/src/PIL/_tkinter_finder.py +++ b/src/PIL/_tkinter_finder.py @@ -1,9 +1,12 @@ """ Find compiled module linking to Tcl / Tk libraries """ import sys +import tkinter from tkinter import _tkinter as tk if hasattr(sys, "pypy_find_executable"): TKINTER_LIB = tk.tklib_cffi.__file__ else: TKINTER_LIB = tk.__file__ + +tk_version = str(tkinter.TkVersion) diff --git a/src/PIL/features.py b/src/PIL/features.py index da0ca557cf2..ad0047287c0 100644 --- a/src/PIL/features.py +++ b/src/PIL/features.py @@ -9,7 +9,7 @@ modules = { "pil": ("PIL._imaging", "PILLOW_VERSION"), - "tkinter": ("PIL._tkinter_finder", None), + "tkinter": ("PIL._tkinter_finder", "tk_version"), "freetype2": ("PIL._imagingft", "freetype2_version"), "littlecms2": ("PIL._imagingcms", "littlecms_version"), "webp": ("PIL._webp", "webpdecoder_version"), From aa742fd8a446868e2720c91a5bf634f238beded5 Mon Sep 17 00:00:00 2001 From: nulano Date: Mon, 25 Jan 2021 22:13:33 +0100 Subject: [PATCH 2/2] Document availability of tk version number. [ci skip] --- docs/reference/features.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/features.rst b/docs/reference/features.rst index dd218fa0e70..0a6381098da 100644 --- a/docs/reference/features.rst +++ b/docs/reference/features.rst @@ -17,7 +17,7 @@ Modules Support for the following modules can be checked: * ``pil``: The Pillow core module, required for all functionality. -* ``tkinter``: Tkinter support. Version number not available. +* ``tkinter``: Tkinter support. * ``freetype2``: FreeType font support via :py:func:`PIL.ImageFont.truetype`. * ``littlecms2``: LittleCMS 2 support via :py:mod:`PIL.ImageCms`. * ``webp``: WebP image support.