diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2023-08-16 12:32:04 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-16 12:32:04 (GMT) |
commit | 91d935b47b47f5fa5c3eb0ee5e45a627f79babef (patch) | |
tree | 31583ffd882221422116526d050c6a7d17c10037 /Lib/test/test_tkinter/widget_tests.py | |
parent | 220d7e3120ffa23d01f91b7ad89f488b4dda3ef0 (diff) | |
download | cpython-91d935b47b47f5fa5c3eb0ee5e45a627f79babef.zip cpython-91d935b47b47f5fa5c3eb0ee5e45a627f79babef.tar.gz cpython-91d935b47b47f5fa5c3eb0ee5e45a627f79babef.tar.bz2 |
[3.12] gh-104496: Use correct Tcl or Tk version in Tkinter tests (GH-107688) (#107709)
gh-104496: Use correct Tcl or Tk version in Tkinter tests (GH-107688)
In future Tcl and Tk versions can be desynchronized.
(cherry picked from commit 3c8e8f3ceeae08fc43d885f5a4c65a3ee4b1a2c8)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Diffstat (limited to 'Lib/test/test_tkinter/widget_tests.py')
-rw-r--r-- | Lib/test/test_tkinter/widget_tests.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/test_tkinter/widget_tests.py b/Lib/test/test_tkinter/widget_tests.py index 85b0511..514b42b 100644 --- a/Lib/test/test_tkinter/widget_tests.py +++ b/Lib/test/test_tkinter/widget_tests.py @@ -1,7 +1,7 @@ # Common tests for test_tkinter/test_widgets.py and test_ttk/test_widgets.py import tkinter -from test.test_tkinter.support import (AbstractTkTest, tcl_version, +from test.test_tkinter.support import (AbstractTkTest, tk_version, pixels_conv, tcl_obj_eq) import test.support @@ -22,7 +22,7 @@ class AbstractWidgetTest(AbstractTkTest): return self._scaling def _str(self, value): - if not self._stringify and self.wantobjects and tcl_version >= (8, 6): + if not self._stringify and self.wantobjects and tk_version >= (8, 6): return value if isinstance(value, tuple): return ' '.join(map(self._str, value)) @@ -156,7 +156,7 @@ class AbstractWidgetTest(AbstractTkTest): 'flat', 'groove', 'raised', 'ridge', 'solid', 'sunken') errmsg='bad relief "spam": must be '\ 'flat, groove, raised, ridge, solid, or sunken' - if tcl_version < (8, 6): + if tk_version < (8, 6): errmsg = None self.checkInvalidParam(widget, name, 'spam', errmsg=errmsg) |