Skip to content

gh-107262: update Tkinter tests for 8.6.14 #119322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
serhiy-storchaka merged 5 commits into from
May 30, 2024
Merged

gh-107262: update Tkinter tests for 8.6.14 #119322

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22c90ca
Fix tkinter widget tests for tk 8.6.14
DBJim May 21, 2024
e0fa661
test only new behaviour
DBJim May 21, 2024
4163ef6
Merge branch 'python:main' into main
DBJim May 29, 2024
78279f3
Merge branch 'main' into main
serhiy-storchaka May 30, 2024
056c5a5
Preserve the tests for older Tcl/Tk.
serhiy-storchaka May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Preserve the tests for older Tcl/Tk.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed May 30, 2024
commit 056c5a5936203efaff5e18c14e192ef3185073d5
22 changes: 13 additions & 9 deletions Lib/test/test_tkinter/test_widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,9 +659,10 @@ def test_configure_state(self):
def test_configure_tabs(self):
widget = self.create()
self.checkParam(widget, 'tabs', (10.2, 20.7, '1i', '2i'))
if get_tk_patchlevel(self.root) >= (8, 6, 14):
self.checkParam(widget, 'tabs', '10.2 20.7 1i 2i',
expected=(10.2, 20.7, '1i', '2i'))
self.checkParam(widget, 'tabs', '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',
expected=('2c', 'left', '4c', '6c', 'center'))
self.checkInvalidParam(widget, 'tabs', 'spam',
Expand Down Expand Up @@ -1001,12 +1002,15 @@ def test_itemconfigure(self):
with self.assertRaisesRegex(TclError, 'bad listbox index "red"'):
widget.itemconfigure('red')
if get_tk_patchlevel(self.root) >= (8, 6, 14):
self.assertEqual(widget.itemconfigure(0, 'background'),
('background', '', '', '', 'red'))
self.assertEqual(widget.itemconfigure('end', 'background'),
('background', '', '', '', 'violet'))
self.assertEqual(widget.itemconfigure('@0,0', 'background'),
('background', '', '', '', 'red'))
prefix = ('background', '', '', '')
else:
prefix = ('background', 'background', 'Background', '')
self.assertEqual(widget.itemconfigure(0, 'background'),
(*prefix, 'red'))
self.assertEqual(widget.itemconfigure('end', 'background'),
(*prefix, 'violet'))
self.assertEqual(widget.itemconfigure('@0,0', 'background'),
(*prefix, 'red'))

d = widget.itemconfigure(0)
self.assertIsInstance(d, dict)
Expand Down
22 changes: 14 additions & 8 deletions Lib/test/test_ttk/test_widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,20 @@ def test_configure_class(self):

def test_configure_padding(self):
widget = self.create()
if get_tk_patchlevel(self.root) >= (8, 6, 14):
self.checkParam(widget, 'padding', 0, expected=(0,))
self.checkParam(widget, 'padding', 5, expected=(5,))
self.checkParam(widget, 'padding', (5, 6), expected=(5, 6))
self.checkParam(widget, 'padding', (5, 6, 7),
expected=(5, 6, 7))
self.checkParam(widget, 'padding', (5, 6, 7, 8),
expected=(5, 6, 7, 8))
if get_tk_patchlevel(self.root) < (8, 6, 14):
def padding_conv(value):
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),
expected=(5, 6, 7), conv=padding_conv)
self.checkParam(widget, 'padding', (5, 6, 7, 8),
expected=(5, 6, 7, 8), conv=padding_conv)
self.checkParam(widget, 'padding', ('5p', '6p', '7p', '8p'))
self.checkParam(widget, 'padding', (), expected='')

Expand Down