#1207589: merge with 3.3.

This commit is contained in:
Roger Serwy 2013-04-07 12:17:17 -05:00
commit 4687cf795c
2 changed files with 10 additions and 2 deletions

View File

@ -479,7 +479,12 @@ class EditorWindow(object):
if iswin:
self.text.config(cursor="arrow")
for label, eventname, verify_state in self.rmenu_specs:
for item in self.rmenu_specs:
try:
label, eventname, verify_state = item
except ValueError: # see issue1207589
continue
if verify_state is None:
continue
state = getattr(self, verify_state)()
@ -497,7 +502,8 @@ class EditorWindow(object):
def make_rmenu(self):
rmenu = Menu(self.text, tearoff=0)
for label, eventname, _ in self.rmenu_specs:
for item in self.rmenu_specs:
label, eventname = item[0], item[1]
if label is not None:
def command(text=self.text, eventname=eventname):
text.event_generate(eventname)

View File

@ -1015,6 +1015,8 @@ _ Issue #17385: Fix quadratic behavior in threading.Condition. The FIFO
IDLE
----
- Issue #1207589: Backwards-compatibility patch for right-click menu in IDLE.
- Issue #16887: IDLE now accepts Cancel in tabify/untabify dialog box.
- Issue #14254: IDLE now handles readline correctly across shell restarts.