(original) (raw)

changeset: 83636:588fcf36c975 parent: 83634:f95144242466 parent: 83635:fef7f212fe76 user: Roger Serwy roger.serwy@gmail.com date: Sun May 05 22:16:03 2013 -0500 files: Lib/idlelib/EditorWindow.py Lib/idlelib/PyShell.py Misc/NEWS description: #13495: merge with 3.3. diff -r f95144242466 -r 588fcf36c975 Lib/idlelib/EditorWindow.py --- a/Lib/idlelib/EditorWindow.py Sun May 05 19:54:04 2013 -0700 +++ b/Lib/idlelib/EditorWindow.py Sun May 05 22:16:03 2013 -0500 @@ -316,9 +316,6 @@ self.good_load = True is_py_src = self.ispythonsource(filename) self.set_indentation_params(is_py_src) - if is_py_src: - self.color = color = self.ColorDelegator() - per.insertfilter(color) else: io.set_filename(filename) self.good_load = True diff -r f95144242466 -r 588fcf36c975 Lib/idlelib/PyShell.py --- a/Lib/idlelib/PyShell.py Sun May 05 19:54:04 2013 -0700 +++ b/Lib/idlelib/PyShell.py Sun May 05 22:16:03 2013 -0500 @@ -858,8 +858,6 @@ text.bind("<>", self.open_stack_viewer) text.bind("<>", self.toggle_debugger) text.bind("<>", self.toggle_jit_stack_viewer) - self.color = color = self.ColorDelegator() - self.per.insertfilter(color) if use_subprocess: text.bind("<>", self.view_restart_mark) text.bind("<>", self.restart_shell) diff -r f95144242466 -r 588fcf36c975 Misc/NEWS --- a/Misc/NEWS Sun May 05 19:54:04 2013 -0700 +++ b/Misc/NEWS Sun May 05 22:16:03 2013 -0500 @@ -257,6 +257,8 @@ IDLE ---- +- Issue #13495: Avoid loading the color delegator twice in IDLE. + - Issue #17798: Allow IDLE to edit new files when specified on command line. - Issue #14735: Update IDLE docs to omit "Control-z on Windows"./roger.serwy@gmail.com