changeset: 89783:fa34ea4e9e47 branch: 3.4 user: Martin v. Löwis date: Sun Mar 02 20:29:18 2014 +0100 files: Misc/NEWS Tools/msi/msi.py description: Issue #14512: Launch pydoc -b instead of pydocgui.pyw on Windows. diff -r 9be3bf7b5b8d -r fa34ea4e9e47 Misc/NEWS --- a/Misc/NEWS Sun Mar 02 19:42:50 2014 +0100 +++ b/Misc/NEWS Sun Mar 02 20:29:18 2014 +0100 @@ -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 -r 9be3bf7b5b8d -r fa34ea4e9e47 Tools/msi/msi.py --- a/Tools/msi/msi.py Sun Mar 02 19:42:50 2014 +0100 +++ b/Tools/msi/msi.py Sun Mar 02 20:29:18 2014 +0100 @@ -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),