[Python-checkins] python/dist/src/Lib/idlelib EditorWindow.py, 1.53, 1.54

Tue Sep 23 16:53:12 EDT 2003

Update of /cvsroot/python/python/dist/src/Lib/idlelib
In directory sc8-pr-cvs1:/tmp/cvs-serv8371
Modified Files:
	EditorWindow.py 
Log Message:
Let IDLE use the HTMLHelp docs on Windows, if found.
Already 'backported' to release23-maint.
Index: EditorWindow.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/EditorWindow.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** EditorWindow.py	9 Jul 2003 18:48:24 -0000	1.53
--- EditorWindow.py	23 Sep 2003 20:53:10 -0000	1.54
***************
*** 51,54 ****
--- 51,55 ----
 def __init__(self, flist=None, filename=None, key=None, root=None):
 if EditorWindow.help_url is None:
+ dochome = os.path.join(sys.prefix, 'Doc', 'index.html')
 if sys.platform.count('linux'):
 # look for html docs in a couple of standard places
***************
*** 60,65 ****
 dochome = os.path.join(basepath, pyver,
 'Doc', 'index.html')
! else:
! dochome = os.path.join(sys.prefix, 'Doc', 'index.html')
 dochome = os.path.normpath(dochome)
 if os.path.isfile(dochome):
--- 61,69 ----
 dochome = os.path.join(basepath, pyver,
 'Doc', 'index.html')
! elif sys.platform.count('win') or sys.platform.count('nt'):
! chmfile = os.path.join(sys.prefix, "Python%d%d.chm" % sys.version_info[:2])
! if os.path.isfile(chmfile):
! dochome = chmfile
! print "dochome =", dochome
 dochome = os.path.normpath(dochome)
 if os.path.isfile(dochome):