Move finding dochome logic to separate function in help.py

Author: StanFromIreland

Lib/idlelib/editor.py

@@ -29,6 +29,7 @@
 from idlelib.tree import wheel_event
 from idlelib.util import py_extensions
 from idlelib import window
+from idlelib.help import _get_dochome
 
 # The default tab setting for a Text widget, in average-width characters.
 TK_TABWIDTH_DEFAULT = 8
@@ -76,44 +77,7 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
         from idlelib.runscript import ScriptBinding
 
         if EditorWindow.help_url is None:
-            dochome =  os.path.join(sys.base_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]
-                if os.path.isdir('/var/www/html/python/'):  # "python2" rpm
-                    dochome = '/var/www/html/python/index.html'
-                else:
-                    basepath = '/usr/share/doc/'  # standard location
-                    dochome = os.path.join(basepath, pyver,
-                                           'Doc', 'index.html')
-            elif sys.platform[:3] == 'win':
-                import winreg  # Windows only, block only executed once.
-                docfile = ''
-                KEY = (rf"Software\Python\PythonCore\{sys.winver}"
-                        r"\Help\Main Python Documentation")
-                try:
-                    docfile = winreg.QueryValue(winreg.HKEY_CURRENT_USER, KEY)
-                except FileNotFoundError:
-                    try:
-                        docfile = winreg.QueryValue(winreg.HKEY_LOCAL_MACHINE,
-                                                    KEY)
-                    except FileNotFoundError:
-                        pass
-                if os.path.isfile(docfile):
-                    dochome = docfile
-            elif sys.platform == 'darwin':
-                # documentation may be stored inside a python framework
-                dochome = os.path.join(sys.base_prefix,
-                        'Resources/English.lproj/Documentation/index.html')
-            dochome = os.path.normpath(dochome)
-            if os.path.isfile(dochome):
-                EditorWindow.help_url = dochome
-                if sys.platform == 'darwin':
-                    # Safari requires real file:-URLs
-                    EditorWindow.help_url = 'file://' + EditorWindow.help_url
-            else:
-                EditorWindow.help_url = ("https://docs.python.org/%d.%d/"
-                                         % sys.version_info[:2])
+            EditorWindow.help_url = _get_dochome()
         self.flist = flist
         root = root or flist.root
         self.root = root

Lib/idlelib/help.py

@@ -24,6 +24,8 @@
 
 show_idlehelp - Create HelpWindow.  Called in EditorWindow.help_dialog.
 """
+import os
+import sys
 from html.parser import HTMLParser
 from os.path import abspath, dirname, isfile, join
 from platform import python_version
@@ -35,6 +37,9 @@
 from idlelib.config import idleConf
 from idlelib.colorizer import color_config
 
+from idlelib.editor import EditorWindow
+
+
 ## About IDLE ##
 
 
@@ -289,6 +294,44 @@ def show_idlehelp(parent):
     return HelpWindow(parent, filename, 'IDLE Doc (%s)' % python_version())
 
 
+def _get_dochome():
+    dochome = os.path.join(sys.base_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]
+        if os.path.isdir('/var/www/html/python/'):  # "python2" rpm
+            dochome = '/var/www/html/python/index.html'
+        else:
+            basepath = '/usr/share/doc/'  # standard location
+            dochome = os.path.join(basepath, pyver,
+                                   'Doc', 'index.html')
+    elif sys.platform[:3] == 'win':
+        import winreg  # Windows only, block only executed once.
+        docfile = ''
+        KEY = (rf"Software\Python\PythonCore\{sys.winver}"
+               r"\Help\Main Python Documentation")
+        try:
+            docfile = winreg.QueryValue(winreg.HKEY_CURRENT_USER, KEY)
+        except FileNotFoundError:
+            try:
+                docfile = winreg.QueryValue(winreg.HKEY_LOCAL_MACHINE, KEY)
+            except FileNotFoundError:
+                pass
+        if os.path.isfile(docfile):
+            dochome = docfile
+    elif sys.platform == 'darwin':
+        # documentation may be stored inside a python framework
+        dochome = os.path.join(sys.base_prefix,
+                               'Resources/English.lproj/Documentation/index.html')
+    dochome = os.path.normpath(dochome)
+    if os.path.isfile(dochome):
+        if sys.platform == 'darwin':
+            # Safari requires real file:-URLs
+            return 'file://' + dochome
+        return dochome
+    else:
+        return "https://docs.python.org/%d.%d/" % sys.version_info[:2]
+
 if __name__ == '__main__':
     from unittest import main
     main('idlelib.idle_test.test_help', verbosity=2, exit=False)