From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 2 Mar 2014 19:29:18 +0000 (+0100)
Subject: Issue #14512: Launch pydoc -b instead of pydocgui.pyw on Windows.
X-Git-Tag: v3.4.0rc3~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c3ea0942d75cfd2b484a3ae5d0a41f9fb1c8984;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Misc/NEWS b/Misc/NEWS
index b9c713c82211..8b68f00df793 100644
--- 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 2ba72e4f7299..e399ddeafad1 100644
--- 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),