Issue #14512: Launch pydoc -b instead of pydocgui.pyw on Windows.

diff --git a/Misc/NEWS b/Misc/NEWS
index b9c713c82211808270faada3345a2b6661543f66..8b68f00df793cc8585b883bf8046ca5aeb592962 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,8 @@ Core and Builtins
 Build
 -----
 
+- Issue #14512: Launch pydoc -b instead of pydocgui.pyw on Windows.
+
 - Issue #20748: Uninstalling pip does not leave behind the pyc of
   the uninstaller anymore.
 

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 2ba72e4f7299ec6be8f42f6f65bb29500e0c2030..e399ddeafad1ba5880800501071c17d79b5c58aa 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1324,8 +1324,6 @@ def add_registry(db):
         tcltkshortcuts = [
               ("IDLE", "MenuDir", "IDLE|IDLE (Python GUI)", "pythonw.exe",
                tcltk.id, r'"[TARGETDIR]Lib\idlelib\idle.pyw"', None, None, "python_icon.exe", 0, None, "TARGETDIR"),
-              ("PyDoc", "MenuDir", "MODDOCS|Module Docs", "pythonw.exe",
-               tcltk.id, r'"[TARGETDIR]Tools\scripts\pydocgui.pyw"', None, None, "python_icon.exe", 0, None, "TARGETDIR"),
               ]
     add_data(db, "Shortcut",
              tcltkshortcuts +
@@ -1340,6 +1338,8 @@ def add_registry(db):
               ("Manual", "MenuDir", "MANUAL|Python Manuals", "REGISTRY.doc",
                "[#%s]" % docfile, None,
                None, None, None, None, None, None),
+              ("PyDoc", "MenuDir", "MODDOCS|Module Docs", "python.exe",
+               default_feature.id, r'-m pydoc -b', None, None, "python_icon.exe", 0, None, "TARGETDIR"),
               ("Uninstall", "MenuDir", "UNINST|Uninstall Python", "REGISTRY",
                SystemFolderName+"msiexec",  "/x%s" % product_code,
                None, None, None, None, None, None),