summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2014-03-02 19:29:18 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2014-03-02 19:29:18 (GMT)
commit2b4b3779661346ea71ce4858000b3fc9620b8da9 (patch)
treeb8d54d1cb51f6840957cc08e0382728835b997de
parent09257f7ced6a9ea9a14290aedbc3b8472ee85d49 (diff)
downloadcpython-2b4b3779661346ea71ce4858000b3fc9620b8da9.zip
cpython-2b4b3779661346ea71ce4858000b3fc9620b8da9.tar.gz
cpython-2b4b3779661346ea71ce4858000b3fc9620b8da9.tar.bz2
Issue #14512: Launch pydoc -b instead of pydocgui.pyw on Windows.
-rw-r--r--Misc/NEWS2
-rw-r--r--Tools/msi/msi.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 1d5b65c..a8e7e4b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -42,6 +42,8 @@ Tests
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 2ba72e4..e399dde 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),