cpython: 588fcf36c975 (original) (raw)
Mercurial > cpython
changeset 83636:588fcf36c975
#13495: merge with 3.3. [#13495]
| Roger Serwy roger.serwy@gmail.com | |
|---|---|
| date | Sun, 05 May 2013 22:16:03 -0500 |
| parents | f95144242466(current diff)fef7f212fe76(diff) |
| children | c4f92b597074 |
| files | Lib/idlelib/EditorWindow.py Lib/idlelib/PyShell.py Misc/NEWS |
| diffstat | 3 files changed, 2 insertions(+), 5 deletions(-)[+] [-] Lib/idlelib/EditorWindow.py 3 Lib/idlelib/PyShell.py 2 Misc/NEWS 2 |
line wrap: on
line diff
--- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -316,9 +316,6 @@ class EditorWindow(object): self.good_load = True is_py_src = self.ispythonsource(filename) self.set_indentation_params(is_py_src)
if is_py_src:[](#l1.7)self.color = color = self.ColorDelegator()[](#l1.8)per.insertfilter(color)[](#l1.9) else:[](#l1.10) io.set_filename(filename)[](#l1.11) self.good_load = True[](#l1.12)
--- a/Lib/idlelib/PyShell.py +++ b/Lib/idlelib/PyShell.py @@ -858,8 +858,6 @@ class PyShell(OutputWindow): text.bind("<>", self.open_stack_viewer) text.bind("<>", self.toggle_debugger) text.bind("<>", self.toggle_jit_stack_viewer)
self.color = color = self.ColorDelegator()[](#l2.7)self.per.insertfilter(color)[](#l2.8) if use_subprocess:[](#l2.9) text.bind("<<view-restart>>", self.view_restart_mark)[](#l2.10) text.bind("<<restart-shell>>", self.restart_shell)[](#l2.11)
--- a/Misc/NEWS +++ b/Misc/NEWS @@ -257,6 +257,8 @@ C-API IDLE ---- +- Issue #13495: Avoid loading the color delegator twice in IDLE. +