py-cvs-2000_07_13 (Rev 1.38) merge

"Remove legacy support for the BrowserControl module; the webbrowser
module has been included since Python 2.0, and that is the preferred
interface." --fdrake

1 files changed, 3 insertions, 7 deletions

diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 17837a9..3ab452e 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -12,12 +12,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
@@ -313,7 +309,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