Let IDLE use the HTMLHelp docs on Windows, if found.

Already 'backported' to release23-maint.

diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index d574b05fa1c5caa4da13032feebe937122a9ca6b..0f0961cd75cdb62ede2623b1f57439a91a8e76c3 100644 (file)
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -50,6 +50,7 @@ class EditorWindow:
 
     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
                 pyver = 'python-docs-' + '%s.%s.%s' % sys.version_info[:3]
@@ -59,8 +60,11 @@ class EditorWindow:
                     basepath = '/usr/share/doc/'  # standard location
                     dochome = os.path.join(basepath, pyver,
                                            'Doc', 'index.html')
-            else:
-                dochome =  os.path.join(sys.prefix, '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):
                 EditorWindow.help_url = dochome