Skip to content

Commit 81c8f7d

Browse files
[3.11] gh-104496: Use correct Tcl or Tk version in Tkinter tests (GH-107688) (GH-107719)
In future Tcl and Tk versions can be desynchronized. (cherry picked from commit 3c8e8f3)
1 parent 880670a commit 81c8f7d

File tree

7 files changed

+30
-39
lines changed

7 files changed

+30
-39
lines changed

Lib/test/test_tcl.py

+2-11
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@
2323

2424
tcl_version = tuple(map(int, _tkinter.TCL_VERSION.split('.')))
2525

26-
_tk_patchlevel = None
27-
def get_tk_patchlevel():
28-
global _tk_patchlevel
29-
if _tk_patchlevel is None:
30-
tcl = Tcl()
31-
_tk_patchlevel = tcl.info_patchlevel()
32-
return _tk_patchlevel
33-
3426

3527
class TkinterTest(unittest.TestCase):
3628

@@ -574,7 +566,6 @@ def test_splitlist(self):
574566
(1, '2', (3.4,)) if self.wantobjects else
575567
('1', '2', '3.4')),
576568
]
577-
tk_patchlevel = get_tk_patchlevel()
578569
if not self.wantobjects:
579570
expected = ('12', '\u20ac', '\xe2\x82\xac', '3.4')
580571
else:
@@ -583,8 +574,8 @@ def test_splitlist(self):
583574
(call('dict', 'create', 12, '\u20ac', b'\xe2\x82\xac', (3.4,)),
584575
expected),
585576
]
586-
dbg_info = ('want objects? %s, Tcl version: %s, Tk patchlevel: %s'
587-
% (self.wantobjects, tcl_version, tk_patchlevel))
577+
dbg_info = ('want objects? %s, Tcl version: %s, Tcl patchlevel: %s'
578+
% (self.wantobjects, tcl_version, self.interp.info_patchlevel()))
588579
for arg, res in testcases:
589580
self.assertEqual(splitlist(arg), res,
590581
'arg=%a, %s' % (arg, dbg_info))

Lib/tkinter/test/support.py

+9-9
Original file line numberDiff line numberDiff line change
@@ -80,28 +80,28 @@ def simulate_mouse_click(widget, x, y):
8080

8181
import _tkinter
8282
tcl_version = tuple(map(int, _tkinter.TCL_VERSION.split('.')))
83+
tk_version = tuple(map(int, _tkinter.TK_VERSION.split('.')))
8384

84-
def requires_tcl(*version):
85-
if len(version) <= 2:
86-
return unittest.skipUnless(tcl_version >= version,
87-
'requires Tcl version >= ' + '.'.join(map(str, version)))
85+
def requires_tk(*version):
86+
if len(version) <= 2 and tk_version >= version:
87+
return lambda test: test
8888

8989
def deco(test):
9090
@functools.wraps(test)
9191
def newtest(self):
92-
if get_tk_patchlevel() < version:
93-
self.skipTest('requires Tcl version >= ' +
92+
root = getattr(self, 'root', None)
93+
if get_tk_patchlevel(root) < version:
94+
self.skipTest('requires Tk version >= ' +
9495
'.'.join(map(str, version)))
9596
test(self)
9697
return newtest
9798
return deco
9899

99100
_tk_patchlevel = None
100-
def get_tk_patchlevel():
101+
def get_tk_patchlevel(root):
101102
global _tk_patchlevel
102103
if _tk_patchlevel is None:
103-
tcl = tkinter.Tcl()
104-
_tk_patchlevel = tcl.info_patchlevel()
104+
_tk_patchlevel = tkinter._parse_version(root.tk.globalgetvar('tk_patchLevel'))
105105
return _tk_patchlevel
106106

107107
units = {

Lib/tkinter/test/test_tkinter/test_images.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import tkinter
33
from test import support
44
from test.support import os_helper
5-
from tkinter.test.support import AbstractTkTest, AbstractDefaultRootTest, requires_tcl
5+
from tkinter.test.support import AbstractTkTest, AbstractDefaultRootTest, requires_tk
66

77
support.requires('gui')
88

@@ -213,11 +213,11 @@ def test_create_from_gif_file(self):
213213
def test_create_from_gif_data(self):
214214
self.check_create_from_data('gif')
215215

216-
@requires_tcl(8, 6)
216+
@requires_tk(8, 6)
217217
def test_create_from_png_file(self):
218218
self.check_create_from_file('png')
219219

220-
@requires_tcl(8, 6)
220+
@requires_tk(8, 6)
221221
def test_create_from_png_data(self):
222222
self.check_create_from_data('png')
223223

Lib/tkinter/test/test_tkinter/test_widgets.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55
from test.support import requires
66

7-
from tkinter.test.support import (requires_tcl,
7+
from tkinter.test.support import (requires_tk,
88
get_tk_patchlevel, widget_eq,
99
AbstractDefaultRootTest)
1010
from tkinter.test.widget_tests import (
@@ -614,7 +614,7 @@ def test_configure_inactiveselectbackground(self):
614614
widget = self.create()
615615
self.checkColorParam(widget, 'inactiveselectbackground')
616616

617-
@requires_tcl(8, 6)
617+
@requires_tk(8, 6)
618618
def test_configure_insertunfocussed(self):
619619
widget = self.create()
620620
self.checkEnumParam(widget, 'insertunfocussed',
@@ -919,7 +919,7 @@ def test_coords(self):
919919
for i in range(4):
920920
self.assertIsInstance(coords[i], float)
921921

922-
@requires_tcl(8, 6)
922+
@requires_tk(8, 6)
923923
def test_moveto(self):
924924
widget = self.create()
925925
i1 = widget.create_rectangle(1, 1, 20, 20, tags='group')
@@ -964,7 +964,7 @@ def test_configure_activestyle(self):
964964
self.checkEnumParam(widget, 'activestyle',
965965
'dotbox', 'none', 'underline')
966966

967-
test_configure_justify = requires_tcl(8, 6, 5)(StandardOptionsTests.test_configure_justify)
967+
test_configure_justify = requires_tk(8, 6, 5)(StandardOptionsTests.test_configure_justify)
968968

969969
def test_configure_listvariable(self):
970970
widget = self.create()
@@ -1103,7 +1103,7 @@ def test_configure_digits(self):
11031103

11041104
def test_configure_from(self):
11051105
widget = self.create()
1106-
conv = float if get_tk_patchlevel() >= (8, 6, 10) else float_round
1106+
conv = float if get_tk_patchlevel(self.root) >= (8, 6, 10) else float_round
11071107
self.checkFloatParam(widget, 'from', 100, 14.9, 15.1, conv=conv)
11081108

11091109
def test_configure_label(self):
@@ -1230,19 +1230,19 @@ def test_configure_opaqueresize(self):
12301230
widget = self.create()
12311231
self.checkBooleanParam(widget, 'opaqueresize')
12321232

1233-
@requires_tcl(8, 6, 5)
1233+
@requires_tk(8, 6, 5)
12341234
def test_configure_proxybackground(self):
12351235
widget = self.create()
12361236
self.checkColorParam(widget, 'proxybackground')
12371237

1238-
@requires_tcl(8, 6, 5)
1238+
@requires_tk(8, 6, 5)
12391239
def test_configure_proxyborderwidth(self):
12401240
widget = self.create()
12411241
self.checkPixelsParam(widget, 'proxyborderwidth',
12421242
0, 1.3, 2.9, 6, -2, '10p',
12431243
conv=False)
12441244

1245-
@requires_tcl(8, 6, 5)
1245+
@requires_tk(8, 6, 5)
12461246
def test_configure_proxyrelief(self):
12471247
widget = self.create()
12481248
self.checkReliefParam(widget, 'proxyrelief')

Lib/tkinter/test/test_ttk/test_style.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def test_map_custom_copy(self):
170170
newname = f'C.{name}'
171171
self.assertEqual(style.map(newname), {})
172172
style.map(newname, **default)
173-
if theme == 'alt' and name == '.' and get_tk_patchlevel() < (8, 6, 1):
173+
if theme == 'alt' and name == '.' and get_tk_patchlevel(self.root) < (8, 6, 1):
174174
default['embossed'] = [('disabled', '1')]
175175
self.assertEqual(style.map(newname), default)
176176
for key, value in default.items():

Lib/tkinter/test/test_ttk/test_widgets.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import sys
66

77
from test.test_ttk_textonly import MockTclObj
8-
from tkinter.test.support import (AbstractTkTest, tcl_version, get_tk_patchlevel,
8+
from tkinter.test.support import (AbstractTkTest, tk_version, get_tk_patchlevel,
99
simulate_mouse_click, AbstractDefaultRootTest)
1010
from tkinter.test.widget_tests import (add_standard_options,
1111
AbstractWidgetTest, StandardOptionsTests, IntegerSizeTests, PixelSizeTests,
@@ -20,7 +20,7 @@ def test_configure_class(self):
2020
widget = self.create()
2121
self.assertEqual(widget['class'], '')
2222
errmsg='attempt to change read-only option'
23-
if get_tk_patchlevel() < (8, 6, 0, 'beta', 3):
23+
if get_tk_patchlevel(self.root) < (8, 6, 0, 'beta', 3):
2424
errmsg='Attempt to change read-only option'
2525
self.checkInvalidParam(widget, 'class', 'Foo', errmsg=errmsg)
2626
widget2 = self.create(class_='Foo')
@@ -562,7 +562,7 @@ def test_configure_orient(self):
562562
widget = self.create()
563563
self.assertEqual(str(widget['orient']), 'vertical')
564564
errmsg='attempt to change read-only option'
565-
if get_tk_patchlevel() < (8, 6, 0, 'beta', 3):
565+
if get_tk_patchlevel(self.root) < (8, 6, 0, 'beta', 3):
566566
errmsg='Attempt to change read-only option'
567567
self.checkInvalidParam(widget, 'orient', 'horizontal',
568568
errmsg=errmsg)
@@ -1528,7 +1528,7 @@ def test_heading(self):
15281528

15291529
def test_heading_callback(self):
15301530
def simulate_heading_click(x, y):
1531-
if tcl_version >= (8, 6):
1531+
if tk_version >= (8, 6):
15321532
self.assertEqual(self.tv.identify_column(x), '#0')
15331533
self.assertEqual(self.tv.identify_region(x, y), 'heading')
15341534
simulate_mouse_click(self.tv, x, y)

Lib/tkinter/test/widget_tests.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import unittest
44
import tkinter
5-
from tkinter.test.support import (AbstractTkTest, tcl_version,
5+
from tkinter.test.support import (AbstractTkTest, tk_version,
66
pixels_conv, tcl_obj_eq)
77
import test.support
88

@@ -23,7 +23,7 @@ def scaling(self):
2323
return self._scaling
2424

2525
def _str(self, value):
26-
if not self._stringify and self.wantobjects and tcl_version >= (8, 6):
26+
if not self._stringify and self.wantobjects and tk_version >= (8, 6):
2727
return value
2828
if isinstance(value, tuple):
2929
return ' '.join(map(self._str, value))
@@ -157,7 +157,7 @@ def checkReliefParam(self, widget, name):
157157
'flat', 'groove', 'raised', 'ridge', 'solid', 'sunken')
158158
errmsg='bad relief "spam": must be '\
159159
'flat, groove, raised, ridge, solid, or sunken'
160-
if tcl_version < (8, 6):
160+
if tk_version < (8, 6):
161161
errmsg = None
162162
self.checkInvalidParam(widget, name, 'spam',
163163
errmsg=errmsg)

0 commit comments

Comments
 (0)