Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-30 21:21:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[3.13] gh-107262: Update Tkinter tests for Tcl/Tk 8.6.14 (GH-119322) (GH-119806)

Browse source 
(cherry picked from commit 9732ed5ca9)

Co-authored-by: James De Bias <81095953+DBJim@users.noreply.github.com>
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
This commit is contained in:
Miss Islington (bot) 2024-05-30 23:16:35 +02:00 • committed by GitHub
parent 1e75dc7324
commit 978b86a91e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_tkinter/test_widgets.py
View file

@ -660,7 +660,9 @@ def test_configure_tabs(self):
widget = self.create() widget = self.create()
self.checkParam(widget, 'tabs', (10.2, 20.7, '1i', '2i')) self.checkParam(widget, 'tabs', (10.2, 20.7, '1i', '2i'))
self.checkParam(widget, 'tabs', '10.2 20.7 1i 2i', self.checkParam(widget, 'tabs', '10.2 20.7 1i 2i',
expected=('10.2', '20.7', '1i', '2i')) expected=(10.2, 20.7, '1i', '2i')
if get_tk_patchlevel(self.root) >= (8, 6, 14)
else ('10.2', '20.7', '1i', '2i'))
self.checkParam(widget, 'tabs', '2c left 4c 6c center', self.checkParam(widget, 'tabs', '2c left 4c 6c center',
expected=('2c', 'left', '4c', '6c', 'center')) expected=('2c', 'left', '4c', '6c', 'center'))
self.checkInvalidParam(widget, 'tabs', 'spam', self.checkInvalidParam(widget, 'tabs', 'spam',
@ -999,12 +1001,16 @@ def test_itemconfigure(self):
widget.itemconfigure() widget.itemconfigure()
with self.assertRaisesRegex(TclError, 'bad listbox index "red"'): with self.assertRaisesRegex(TclError, 'bad listbox index "red"'):
widget.itemconfigure('red') widget.itemconfigure('red')
if get_tk_patchlevel(self.root) >= (8, 6, 14):
prefix = ('background', '', '', '')
else:
prefix = ('background', 'background', 'Background', '')
self.assertEqual(widget.itemconfigure(0, 'background'), self.assertEqual(widget.itemconfigure(0, 'background'),
('background', 'background', 'Background', '', 'red')) (*prefix, 'red'))
self.assertEqual(widget.itemconfigure('end', 'background'), self.assertEqual(widget.itemconfigure('end', 'background'),
('background', 'background', 'Background', '', 'violet')) (*prefix, 'violet'))
self.assertEqual(widget.itemconfigure('@0,0', 'background'), self.assertEqual(widget.itemconfigure('@0,0', 'background'),
('background', 'background', 'Background', '', 'red')) (*prefix, 'red'))
d = widget.itemconfigure(0) d = widget.itemconfigure(0)
self.assertIsInstance(d, dict) self.assertIsInstance(d, dict)

17
Lib/test/test_ttk/test_widgets.py
View file

@ -27,13 +27,20 @@ def test_configure_class(self):
def test_configure_padding(self): def test_configure_padding(self):
widget = self.create() widget = self.create()
self.checkParam(widget, 'padding', 0, expected=('0',)) if get_tk_patchlevel(self.root) < (8, 6, 14):
self.checkParam(widget, 'padding', 5, expected=('5',)) def padding_conv(value):
self.checkParam(widget, 'padding', (5, 6), expected=('5', '6')) self.assertIsInstance(value, tuple)
return tuple(map(str, value))
else:
padding_conv = None
self.checkParam(widget, 'padding', 0, expected=(0,), conv=padding_conv)
self.checkParam(widget, 'padding', 5, expected=(5,), conv=padding_conv)
self.checkParam(widget, 'padding', (5, 6),
expected=(5, 6), conv=padding_conv)
self.checkParam(widget, 'padding', (5, 6, 7), self.checkParam(widget, 'padding', (5, 6, 7),
expected=('5', '6', '7')) expected=(5, 6, 7), conv=padding_conv)
self.checkParam(widget, 'padding', (5, 6, 7, 8), self.checkParam(widget, 'padding', (5, 6, 7, 8),
expected=('5', '6', '7', '8')) expected=(5, 6, 7, 8), conv=padding_conv)
self.checkParam(widget, 'padding', ('5p', '6p', '7p', '8p')) self.checkParam(widget, 'padding', ('5p', '6p', '7p', '8p'))
self.checkParam(widget, 'padding', (), expected='') self.checkParam(widget, 'padding', (), expected='')