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

Wed Sep 23 05:00:31 CEST 2015

https://hg.python.org/cpython/rev/16b9207225d4
changeset: 98206:16b9207225d4
branch: 3.5
parent: 98202:9c248233754c
parent: 98205:c607004a98bf
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Tue Sep 22 22:59:53 2015 -0400
summary:
 Merge with 3.4
files:
 Lib/idlelib/EditorWindow.py | 10 +++++-----
 1 files changed, 5 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
@@ -43,11 +43,6 @@
 class HelpDialog(object):
 
 def __init__(self):
- import warnings as w
- w.warn("EditorWindow.HelpDialog is no longer used by Idle.\n"
- "It will be removed in 3.6 or later.\n"
- "It has been replaced by private help.HelpWindow\n",
- DeprecationWarning, stacklevel=2)
 self.parent = None # parent of help window
 self.dlg = None # the help window iteself
 
@@ -59,6 +54,11 @@
 near - a Toplevel widget (e.g. EditorWindow or PyShell)
 to use as a reference for placing the help window
 """
+ import warnings as w
+ w.warn("EditorWindow.HelpDialog is no longer used by Idle.\n"
+ "It will be removed in 3.6 or later.\n"
+ "It has been replaced by private help.HelpWindow\n",
+ DeprecationWarning, stacklevel=2)
 if self.dlg is None:
 self.show_dialog(parent)
 if near:
-- 
Repository URL: https://hg.python.org/cpython
