cpython: 5219c1271156 (original) (raw)

Mercurial > cpython

changeset 83187:5219c1271156

#1207589: merge with 3.3. [#1207589]

Roger Serwy roger.serwy@gmail.com
date	Sun, 07 Apr 2013 12:17:17 -0500
parents	09a84091ae96(current diff)c26ec5897c5a(diff)
children	b45675223885
files	Lib/idlelib/EditorWindow.py Misc/NEWS
diffstat	2 files changed, 10 insertions(+), 2 deletions(-)[+] [-] Lib/idlelib/EditorWindow.py 10 Misc/NEWS 2

line wrap: on

line diff

--- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -479,7 +479,12 @@ class EditorWindow(object): if iswin: self.text.config(cursor="arrow")

   for label, eventname, verify_state in self.rmenu_specs:[](#l1.7)

   for item in self.rmenu_specs:[](#l1.8)

```
       try:[](#l1.9)
```

           label, eventname, verify_state = item[](#l1.10)

       except ValueError: # see issue1207589[](#l1.11)

```
           continue[](#l1.12)
```

+ 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:[](#l1.21)

   for item in self.rmenu_specs:[](#l1.22)

       label, eventname = item[0], item[1][](#l1.23)
       if label is not None:[](#l1.24)
           def command(text=self.text, eventname=eventname):[](#l1.25)
               text.event_generate(eventname)[](#l1.26)

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -1015,6 +1015,8 @@ Library 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.