Remove legacy support for the BrowserControl module; the webbrowser

module has been included since Python 2.0, and that is the preferred
interface.

diff --git a/Tools/idle/EditorWindow.py b/Tools/idle/EditorWindow.py
index 589b0ab69f2222e127e122c1397010c1169983d7..bb69a5be3ddb75cd9b0dc4ebede916fd85e1761b 100644 (file)
--- 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