Skip to content

Commit 9d727fe

Browse files
miss-islingtonDBJimserhiy-storchaka
authored
[3.11] gh-107262: Update Tkinter tests for Tcl/Tk 8.6.14 (GH-119322) (#130276)
Co-authored-by: James De Bias <[email protected]> Co-authored-by: Serhiy Storchaka <[email protected]>
1 parent b2c3a95 commit 9d727fe

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

Lib/tkinter/test/test_tkinter/test_widgets.py

+10-4
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,9 @@ def test_configure_tabs(self):
661661
widget = self.create()
662662
self.checkParam(widget, 'tabs', (10.2, 20.7, '1i', '2i'))
663663
self.checkParam(widget, 'tabs', '10.2 20.7 1i 2i',
664-
expected=('10.2', '20.7', '1i', '2i'))
664+
expected=(10.2, 20.7, '1i', '2i')
665+
if get_tk_patchlevel(self.root) >= (8, 6, 14)
666+
else ('10.2', '20.7', '1i', '2i'))
665667
self.checkParam(widget, 'tabs', '2c left 4c 6c center',
666668
expected=('2c', 'left', '4c', '6c', 'center'))
667669
self.checkInvalidParam(widget, 'tabs', 'spam',
@@ -994,12 +996,16 @@ def test_itemconfigure(self):
994996
widget.itemconfigure()
995997
with self.assertRaisesRegex(TclError, 'bad listbox index "red"'):
996998
widget.itemconfigure('red')
999+
if get_tk_patchlevel(self.root) >= (8, 6, 14):
1000+
prefix = ('background', '', '', '')
1001+
else:
1002+
prefix = ('background', 'background', 'Background', '')
9971003
self.assertEqual(widget.itemconfigure(0, 'background'),
998-
('background', 'background', 'Background', '', 'red'))
1004+
(*prefix, 'red'))
9991005
self.assertEqual(widget.itemconfigure('end', 'background'),
1000-
('background', 'background', 'Background', '', 'violet'))
1006+
(*prefix, 'violet'))
10011007
self.assertEqual(widget.itemconfigure('@0,0', 'background'),
1002-
('background', 'background', 'Background', '', 'red'))
1008+
(*prefix, 'red'))
10031009

10041010
d = widget.itemconfigure(0)
10051011
self.assertIsInstance(d, dict)

Lib/tkinter/test/test_ttk/test_widgets.py

+12-5
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,20 @@ def test_configure_class(self):
2828

2929
def test_configure_padding(self):
3030
widget = self.create()
31-
self.checkParam(widget, 'padding', 0, expected=('0',))
32-
self.checkParam(widget, 'padding', 5, expected=('5',))
33-
self.checkParam(widget, 'padding', (5, 6), expected=('5', '6'))
31+
if get_tk_patchlevel(self.root) < (8, 6, 14):
32+
def padding_conv(value):
33+
self.assertIsInstance(value, tuple)
34+
return tuple(map(str, value))
35+
else:
36+
padding_conv = None
37+
self.checkParam(widget, 'padding', 0, expected=(0,), conv=padding_conv)
38+
self.checkParam(widget, 'padding', 5, expected=(5,), conv=padding_conv)
39+
self.checkParam(widget, 'padding', (5, 6),
40+
expected=(5, 6), conv=padding_conv)
3441
self.checkParam(widget, 'padding', (5, 6, 7),
35-
expected=('5', '6', '7'))
42+
expected=(5, 6, 7), conv=padding_conv)
3643
self.checkParam(widget, 'padding', (5, 6, 7, 8),
37-
expected=('5', '6', '7', '8'))
44+
expected=(5, 6, 7, 8), conv=padding_conv)
3845
self.checkParam(widget, 'padding', ('5p', '6p', '7p', '8p'))
3946
self.checkParam(widget, 'padding', (), expected='')
4047

0 commit comments

Comments
 (0)