From: Fred Drake <fdrake@acm.org>
Date: Sun, 9 Jul 2000 19:10:19 +0000 (+0000)
Subject: Update to use the new standard webbrowser module if available, otherwise
X-Git-Tag: v2.0b1~951
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3637799afe046be1a1a47ce53da404745f828452;p=thirdparty%2FPython%2Fcpython.git

Update to use the new standard webbrowser module if available, otherwise
uses the BrowserControl module.

BrowserControl is not removed to allow IDLE to be distributed separately
and still be used with Python 1.5.2.
---

diff --git a/Tools/idle/EditorWindow.py b/Tools/idle/EditorWindow.py
index 53f2520545d4..d744a2e386cf 100644
--- a/Tools/idle/EditorWindow.py
+++ b/Tools/idle/EditorWindow.py
@@ -6,7 +6,12 @@ import imp
 from Tkinter import *
 import tkSimpleDialog
 import tkMessageBox
-import BrowserControl
+try:
+    import webbrowser
+except ImportError:
+    import BrowserControl
+    webbrowser = BrowserControl
+    del BrowserControl
 import idlever
 import WindowList
 from IdleConf import idleconf
@@ -27,6 +32,7 @@ TK_TABWIDTH_DEFAULT = 8
 #$ event <<open-path-browser>>
 
 #$ event <<close-window>>
+
 #$ unix <Control-x><Control-0>
 #$ unix <Control-x><Key-0>
 #$ win <Alt-F4>
@@ -298,7 +304,7 @@ class EditorWindow:
         del fn
 
     def python_docs(self, event=None):
-        BrowserControl.open(self.help_url)
+        webbrowser.open(self.help_url)
 
     def select_all(self, event=None):
         self.text.tag_add("sel", "1.0", "end-1c")