[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

[terry.reedy]

https://hg.python.org/cpython/rev/cc3e23297db7
changeset:   98107:cc3e23297db7
parent:      98103:33d51f2ad66f
parent:      98106:1f602d6046d0
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Sun Sep 20 23:05:52 2015 -0400
summary:
  Merge with 3.5

files:
  Lib/idlelib/EditorWindow.py |  4 +---
  1 files changed, 1 insertions(+), 3 deletions(-)


diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -85,9 +85,7 @@
         self.dlg = None
         self.parent = None
 
-helpDialog = HelpDialog()  # singleton instance
-def _help_dialog(parent):  # wrapper for htest
-    helpDialog.show_dialog(parent)
+helpDialog = HelpDialog()  # singleton instance, no longer used
 
 
 class EditorWindow(object):

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