[Idle-dev] CVS: idle EditorWindow.py,1.3,1.4

[Kurt B. Kaiser]

Update of /cvsroot/idlefork/idle
In directory usw-pr-cvs1:/tmp/cvs-serv30288

Modified Files:
	EditorWindow.py 
Log Message:
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


Index: EditorWindow.py
===================================================================
RCS file: /cvsroot/idlefork/idle/EditorWindow.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** EditorWindow.py	2001/07/13 03:35:32	1.3
--- EditorWindow.py	2001/07/14 03:58:25	1.4
***************
*** 13,22 ****
  import tkSimpleDialog
  import tkMessageBox
! try:
!     import webbrowser
! except ImportError:
!     import BrowserControl
!     webbrowser = BrowserControl
!     del BrowserControl
  import idlever
  import WindowList
--- 13,18 ----
  import tkSimpleDialog
  import tkMessageBox
! 
! import webbrowser
  import idlever
  import WindowList
***************
*** 314,318 ****
      if sys.platform[:3] == "win":
          fn = os.path.dirname(__file__)
!         fn = os.path.join(fn, "../../Doc/index.html")
          fn = os.path.normpath(fn)
          if os.path.isfile(fn):
--- 310,314 ----
      if sys.platform[:3] == "win":
          fn = os.path.dirname(__file__)
!         fn = os.path.join(fn, os.pardir, os.pardir, "Doc", "index.html")
          fn = os.path.normpath(fn)
          if os.path.isfile(fn):