Skip to content

bpo-41384: fix .keys()[0] in tkinter #21601

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
terryjreedy merged 5 commits into from
Jul 27, 2020
Merged

bpo-41384: fix .keys()[0] in tkinter #21601

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3c0fc7b
fix .keys()[0] in tkinter
Akuli Jul 23, 2020
b24f881
delete unnecessary .keys()
Akuli Jul 24, 2020
038919a
delete unnecessary values of OptionMenu
Akuli Jul 25, 2020
2bd0ad1
Merge remote-tracking branch 'upstream/master' into pr_21601
terryjreedy Jul 27, 2020
fcae5de
blurb
terryjreedy Jul 27, 2020
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
2 changes: 1 addition & 1 deletion Lib/tkinter/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3965,7 +3965,7 @@ def __init__(self, master, variable, value, *values, **kwargs):
if 'command' in kwargs:
del kwargs['command']
if kwargs:
raise TclError('unknown option -'+kwargs.keys()[0])
raise TclError('unknown option -'+next(iter(kwargs)))
menu.add_command(label=value,
command=_setit(variable, value, callback))
for v in values:
Expand Down
4 changes: 4 additions & 0 deletions Lib/tkinter/test/test_tkinter/test_widgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,10 @@ class OptionMenuTest(MenubuttonTest, unittest.TestCase):
def create(self, default='b', values=('a', 'b', 'c'), **kwargs):
return tkinter.OptionMenu(self.root, None, default, *values, **kwargs)

def test_bad_kwarg(self):
with self.assertRaisesRegex(TclError, r"^unknown option -image$"):
tkinter.OptionMenu(self.root, None, 'b', 'a', 'b', 'c', image='::tk::icons::question')


@add_standard_options(IntegerSizeTests, StandardOptionsTests)
class EntryTest(AbstractWidgetTest, unittest.TestCase):
Expand Down