Skip to content
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

Jump to bottom

gh-103685: Fix tkinter.Menu.index() for Tk 8.7 #103686

Merged
merged 7 commits into from
Apr 24, 2023
Merged

gh-103685: Fix tkinter.Menu.index() for Tk 8.7 #103686

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
65e8708
gh-103685: Fix tkinter.Menu.index() for Tk 8.7
chrstphrchvz Apr 22, 2023
a293a6b
Update Lib/tkinter/__init__.py
chrstphrchvz Apr 22, 2023
1cc8507
Add a test for tkinter.Menu.index('none')
chrstphrchvz Apr 23, 2023
4fc68f5
Test index(''), which currently fails.
terryjreedy Apr 23, 2023
9fe5c5f
Merge branch 'main' into patch-103685
terryjreedy Apr 23, 2023
bbc4c48
Remove bad test
terryjreedy Apr 23, 2023
55629ca
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 24, 2023
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
5 changes: 5 additions & 0 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 @@ -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)
terryjreedy marked this conversation as resolved.
Show resolved Hide resolved

def test_configure_postcommand(self):
widget = self.create()
self.checkCommandParam(widget, 'postcommand')
Expand Down
3 changes: 1 addition & 2 deletions Lib/tkinter/__init__.py
View file
Open in desktop
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