8000 [3.13] gh-107262: Update Tkinter tests for Tcl/Tk 8.6.14 (GH-119322) … · python/cpython@978b86a · GitHub
[go: up one dir, main page]
Skip to content

Commit 978b86a

Browse files
miss-islingtonDBJimserhiy-storchaka
authored
[3.13] gh-107262: Update Tkinter tests for Tcl/Tk 8.6.14 (GH-119322) (GH-119806)
(cherry picked from commit 9732ed5) Co-authored-by: James De Bias <81095953+DBJim@users.noreply.github.com> Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
1 parent 1e75dc7 commit 978b86a

File tree

2 files changed

+22
-9
lines changed

2 files changed

+22
-9
lines changed

‎Lib/test/test_tkinter/test_widgets.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,9 @@ def test_configure_tabs(self):
660660
widget = self.create()
661661
self.checkParam(widget, 'tabs', (10.2, 20.7, '1i', '2i'))
662662
self.checkParam(widget, 'tabs', '10.2 20.7 1i 2i',
663-
expected=('10.2', '20.7', '1i', '2i'))
663+
expected=(10.2, 20.7, '1i', '2i')
664+
if get_tk_patchlevel(self.root) >= (8, 6, 14)
665+
else ('10.2', '20.7', '1i', '2i'))
664666
self.checkParam(widget, 'tabs', '2c left 4c 6c center',
665667
expected=('2c', 'left', '4c', '6c', 'center'))
666668
self.checkInvalidParam(widget, 'tabs', 'spam',
@@ -999,12 +1001,16 @@ def test_itemconfigure(self):
9991001
widget.itemconfigure()
10001002
with self.assertRaisesRegex(TclError, 'bad listbox index "red"'):
10011003
widget.itemconfigure('red')
1004+
if get_tk_patchlevel(self.root) >= (8, 6, 14):
1005+
prefix = ('background', '', '', '')
1006+
else:
1007+
prefix = ('background', 'background', 'Background', '')
10021008
self.assertEqual(widget.itemconfigure(0, 'background'),
1003-
('background', 'background', 'Background', '', 'red'))
1009+
(*prefix, 'red'))
10041010
self.assertEqual(widget.itemconfigure('end', 'background'),
1005-
('background', 'background', 'Background', '', 'violet'))
1011+
(*prefix, 'violet'))
10061012
self.assertEqual(widget.itemconfigure('@0,0', 'background'),
1007-
('background', 'background', 'Background', '', 'red'))
1013+
(*prefix, 'red'))
10081014

10091015
d = widget.itemconfigure(0)
10101016
self.assertIsInstance(d, dict)

‎Lib/test/test_ttk/test_widgets.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,20 @@ def test_configure_class(self):
2727

2828
def test_configure_padding(self):
2929
widget = self.create()
30-
self.checkParam(widget, 'padding', 0, expected=('0',))
31-
self.checkParam(widget, 'padding', 5, expected=('5',))
32-
self.checkParam(widget, 'padding', (5, 6), expected=('5', '6'))
30+
if get_tk_patchlevel(self.root) < (8, 6, 14):
31+
def padding_conv(value):
32+
self.assertIsInstance(value, tuple)
33+
return tuple(map(str, value))
34+
else:
35+
padding_conv = None
36+
self.checkParam(widget, 'padding', 0, expected=(0,), conv=padding_conv)
37+
self.checkParam(widget, 'padding', 5, expected=(5,), conv=padding_conv)
38+
self.checkParam(widget, 'padding', (5, 6),
39+
expected=(5, 6), conv=padding_conv)
3340
self.checkParam(widget, 'padding', (5, 6, 7),
34-
expected=('5', '6', '7'))
41+
expected=(5, 6, 7), conv=padding_conv)
3542
self.checkParam(widget, 'padding', (5, 6, 7, 8),
36-
expected=('5', '6', '7', '8'))
43+
expected=(5, 6, 7, 8), conv=padding_conv)
3744
self.checkParam(widget, 'padding', ('5p', '6p', '7p', '8p'))
3845
self.checkParam(widget, 'padding', (), expected='')
3946

0 commit comments

Comments
 (0)
0