mirror of
https://github.com/python/cpython.git
synced 2025-09-13 04:08:37 +00:00
Merge with 3.4
This commit is contained in:
commit
1ccf44c476
1 changed files with 5 additions and 5 deletions
|
@ -43,11 +43,6 @@ def _sphinx_version():
|
||||||
class HelpDialog(object):
|
class HelpDialog(object):
|
||||||
|
|
||||||
def __init__(self):
|
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.parent = None # parent of help window
|
||||||
self.dlg = None # the help window iteself
|
self.dlg = None # the help window iteself
|
||||||
|
|
||||||
|
@ -59,6 +54,11 @@ class HelpDialog(object):
|
||||||
near - a Toplevel widget (e.g. EditorWindow or PyShell)
|
near - a Toplevel widget (e.g. EditorWindow or PyShell)
|
||||||
to use as a reference for placing the help window
|
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:
|
if self.dlg is None:
|
||||||
self.show_dialog(parent)
|
self.show_dialog(parent)
|
||||||
if near:
|
if near:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue