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

bpo-41384: Raise TclError in tkinter.OptionMenu (GH-21601)

Browse source 
... when an unknown option is passed.  TypeError was being raised because a 2to3 fix was missing.

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
This commit is contained in:
Akuli 2020-07-27 04:48:17 +03:00 • committed by GitHub
parent 52bf4706a3
commit f1d40f941a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/tkinter/__init__.py
View file

@ -3965,7 +3965,7 @@ def __init__(self, master, variable, value, *values, **kwargs):
if 'command' in kwargs: if 'command' in kwargs:
del kwargs['command'] del kwargs['command']
if kwargs: if kwargs:
raise TclError('unknown option -'+kwargs.keys()[0]) raise TclError('unknown option -'+next(iter(kwargs)))
menu.add_command(label=value, menu.add_command(label=value,
command=_setit(variable, value, callback)) command=_setit(variable, value, callback))
for v in values: for v in values:

4
Lib/tkinter/test/test_tkinter/test_widgets.py
View file

@ -307,6 +307,10 @@ class OptionMenuTest(MenubuttonTest, unittest.TestCase):
def create(self, default='b', values=('a', 'b', 'c'), **kwargs): def create(self, default='b', values=('a', 'b', 'c'), **kwargs):
return tkinter.OptionMenu(self.root, None, default, *values, **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', image='')
@add_standard_options(IntegerSizeTests, StandardOptionsTests) @add_standard_options(IntegerSizeTests, StandardOptionsTests)
class EntryTest(AbstractWidgetTest, unittest.TestCase): class EntryTest(AbstractWidgetTest, unittest.TestCase):

2
Misc/NEWS.d/next/Library/2020-07-26-21-18-43.bpo-41384.MlzIgV.rst Normal file
View file

@ -0,0 +1,2 @@
Raise TclError instead of TypeError when an unknown option is passed to
tkinter.OptionMenu.