[Python-checkins] cpython (merge 3.3 -> default): #13495: merge with 3.3.

[roger.serwy]

http://hg.python.org/cpython/rev/588fcf36c975
changeset:   83636:588fcf36c975
parent:      83634:f95144242466
parent:      83635:fef7f212fe76
user:        Roger Serwy <roger.serwy at gmail.com>
date:        Sun May 05 22:16:03 2013 -0500
summary:
  #13495: merge with 3.3.

files:
  Lib/idlelib/EditorWindow.py |  3 ---
  Lib/idlelib/PyShell.py      |  2 --
  Misc/NEWS                   |  2 ++
  3 files changed, 2 insertions(+), 5 deletions(-)


diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -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 --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -858,8 +858,6 @@
         text.bind("<<open-stack-viewer>>", self.open_stack_viewer)
         text.bind("<<toggle-debugger>>", self.toggle_debugger)
         text.bind("<<toggle-jit-stack-viewer>>", self.toggle_jit_stack_viewer)
-        self.color = color = self.ColorDelegator()
-        self.per.insertfilter(color)
         if use_subprocess:
             text.bind("<<view-restart>>", self.view_restart_mark)
             text.bind("<<restart-shell>>", self.restart_shell)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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".

-- 
Repository URL: http://hg.python.org/cpython