[Python-checkins] cpython (3.4): Issue #14512: Launch pydoc -b instead of pydocgui.pyw on Windows.

Mon Mar 17 07:33:16 CET 2014

http://hg.python.org/cpython/rev/fa34ea4e9e47
changeset: 89783:fa34ea4e9e47
branch: 3.4
user: Martin v. Löwis <martin at v.loewis.de>
date: Sun Mar 02 20:29:18 2014 +0100
summary:
 Issue #14512: Launch pydoc -b instead of pydocgui.pyw on Windows.
files:
 Misc/NEWS | 2 ++
 Tools/msi/msi.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,8 @@
 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
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1324,8 +1324,6 @@
 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 @@
 ("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),
-- 
Repository URL: http://hg.python.org/cpython
