diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2022-08-12 00:11:17 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-12 00:11:17 (GMT) |
| commit | 577dbc3c49615896d5b6fbf0cb25eebd4d28624a (patch) | |
| tree | 4e9cdc26df2c0eb0224f4223e783a2c2dbb7e3ab | |
| parent | 24dd1429e56594ab8b9aff8522305b4f38989711 (diff) | |
| download | cpython-577dbc3c49615896d5b6fbf0cb25eebd4d28624a.zip cpython-577dbc3c49615896d5b6fbf0cb25eebd4d28624a.tar.gz cpython-577dbc3c49615896d5b6fbf0cb25eebd4d28624a.tar.bz2 | |
gh-95841: IDLE - Revise Windows local doc url (GH-95845) (#95905)
GH-91242 replaced the Windows chm help file with a copy
of the html docs. This PR replaces the IDLE code that
fetches the Windows local help url passed to os.startfile.
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
Co-authored-by: Steve Dower
Approved by Steve Dower, #95845 (review), 2nd subblock.
(cherry picked from commit bdb2cf8e913c041f26e8976abe58414819b3e8ff)
| -rw-r--r-- | Lib/idlelib/editor.py | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py index 859a288..08d6aa2 100644 --- a/Lib/idlelib/editor.py +++ b/Lib/idlelib/editor.py @@ -86,10 +86,20 @@ class EditorWindow: dochome = os.path.join(basepath, pyver, 'Doc', 'index.html') elif sys.platform[:3] == 'win': - chmfile = os.path.join(sys.base_prefix, 'Doc', - 'Python%s.chm' % _sphinx_version()) - if os.path.isfile(chmfile): - dochome = chmfile + 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, |