Kaydet (Commit) 4687cf79 authored tarafından Roger Serwy's avatar Roger Serwy

#1207589: merge with 3.3.

...@@ -479,7 +479,12 @@ class EditorWindow(object): ...@@ -479,7 +479,12 @@ class EditorWindow(object):
if iswin: if iswin:
self.text.config(cursor="arrow") 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: if verify_state is None:
continue continue
state = getattr(self, verify_state)() state = getattr(self, verify_state)()
...@@ -497,7 +502,8 @@ class EditorWindow(object): ...@@ -497,7 +502,8 @@ class EditorWindow(object):
def make_rmenu(self): def make_rmenu(self):
rmenu = Menu(self.text, tearoff=0) 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: if label is not None:
def command(text=self.text, eventname=eventname): def command(text=self.text, eventname=eventname):
text.event_generate(eventname) text.event_generate(eventname)
......
...@@ -1015,6 +1015,8 @@ _ Issue #17385: Fix quadratic behavior in threading.Condition. The FIFO ...@@ -1015,6 +1015,8 @@ _ Issue #17385: Fix quadratic behavior in threading.Condition. The FIFO
IDLE IDLE
---- ----
- Issue #1207589: Backwards-compatibility patch for right-click menu in IDLE.
- Issue #16887: IDLE now accepts Cancel in tabify/untabify dialog box. - Issue #16887: IDLE now accepts Cancel in tabify/untabify dialog box.
- Issue #14254: IDLE now handles readline correctly across shell restarts. - Issue #14254: IDLE now handles readline correctly across shell restarts.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment