#13495: merge with 3.3.

This commit is contained in:
Roger Serwy 2013-05-05 22:16:03 -05:00
commit 53683f6f4b
3 changed files with 2 additions and 5 deletions

View File

@ -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:
self.color = color = self.ColorDelegator()
per.insertfilter(color)
else:
io.set_filename(filename)
self.good_load = True

View File

@ -858,8 +858,6 @@ class PyShell(OutputWindow):
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)

View File

@ -257,6 +257,8 @@ C-API
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".