Skip to content

Commit

Permalink
gh-103685: Fix tkinter.Menu.index() for Tk 8.7 (#103686)
Browse files Browse the repository at this point in the history
---------

Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
  • Loading branch information
3 people authored Apr 24, 2023
1 parent bd2dca0 commit f0ed293
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
5 changes: 5 additions & 0 deletions Lib/test/test_tkinter/test_widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -1377,6 +1377,11 @@ class MenuTest(AbstractWidgetTest, unittest.TestCase):
def create(self, **kwargs):
return tkinter.Menu(self.root, **kwargs)

def test_indexcommand_none(self):
widget = self.create()
i = widget.index('none')
self.assertIsNone(i)

def test_configure_postcommand(self):
widget = self.create()
self.checkCommandParam(widget, 'postcommand')
Expand Down
3 changes: 1 addition & 2 deletions Lib/tkinter/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3430,8 +3430,7 @@ def entryconfigure(self, index, cnf=None, **kw):
def index(self, index):
"""Return the index of a menu item identified by INDEX."""
i = self.tk.call(self._w, 'index', index)
if i == 'none': return None
return self.tk.getint(i)
return None if i in ('', 'none') else self.tk.getint(i) # GH-103685.

def invoke(self, index):
"""Invoke a menu item identified by INDEX and execute
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Prepare :meth:`tkinter.Menu.index` for Tk 8.7 so that it does not raise ``TclError: expected integer but got ""`` when it should return ``None``.

0 comments on commit f0ed293

Please sign in to comment.