Merge pull request #5226 from radarhere/tk_version

Added tk version to pilinfo
python-pillow · Jan 26, 2021 · fd578a0 · fd578a0
2 parents baaa298 + bf7635a
commit fd578a0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git 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.

diff --git 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
@@ -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"),