summaryrefslogtreecommitdiffstats
path: root/Tools/idle
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2001-04-18 18:42:48 (GMT)
committerFred Drake <fdrake@acm.org>2001-04-18 18:42:48 (GMT)
commit6e06531d92c8997baab3dadf58f4de7730e24c48 (patch)
treed48fbb52b4de2d319e3f4390d0cca8559ebed0ac /Tools/idle
parent895aa9da4cfcf9a5528a4189660e379d49bbaddf (diff)
downloadcpython-6e06531d92c8997baab3dadf58f4de7730e24c48.zip
cpython-6e06531d92c8997baab3dadf58f4de7730e24c48.tar.gz
cpython-6e06531d92c8997baab3dadf58f4de7730e24c48.tar.bz2
Remove legacy support for the BrowserControl module; the webbrowser
module has been included since Python 2.0, and that is the preferred interface.
Diffstat (limited to 'Tools/idle')
-rw-r--r--Tools/idle/EditorWindow.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/Tools/idle/EditorWindow.py b/Tools/idle/EditorWindow.py
index 589b0ab..bb69a5b 100644
--- a/Tools/idle/EditorWindow.py
+++ b/Tools/idle/EditorWindow.py
@@ -6,12 +6,8 @@ import imp
from Tkinter import *
import tkSimpleDialog
import tkMessageBox
-try:
- import webbrowser
-except ImportError:
- import BrowserControl
- webbrowser = BrowserControl
- del BrowserControl
+
+import webbrowser
import idlever
import WindowList
from IdleConf import idleconf
@@ -298,7 +294,7 @@ class EditorWindow:
help_url = "http://www.python.org/doc/current/"
if sys.platform[:3] == "win":
fn = os.path.dirname(__file__)
- fn = os.path.join(fn, "../../Doc/index.html")
+ fn = os.path.join(fn, os.pardir, os.pardir, "Doc", "index.html")
fn = os.path.normpath(fn)
if os.path.isfile(fn):
help_url = fn