Issue #10747: Merge with 3.4
This commit is contained in:
commit
77143dbaee
|
@ -1,4 +1,4 @@
|
|||
+++++++++++
|
||||
+++++++++++
|
||||
Python News
|
||||
+++++++++++
|
||||
|
||||
|
@ -685,6 +685,8 @@ Windows
|
|||
- Issue #21671, CVE-2014-0224: The bundled version of OpenSSL has been
|
||||
updated to 1.0.1h.
|
||||
|
||||
- Issue #10747: Use versioned labels in the Windows start menu.
|
||||
Patch by Olive Kilburn.
|
||||
|
||||
What's New in Python 3.4.0?
|
||||
===========================
|
||||
|
|
|
@ -1320,27 +1320,38 @@ def add_registry(db):
|
|||
add_data(db, "RemoveFile",
|
||||
[("MenuDir", "TARGETDIR", None, "MenuDir", 2)])
|
||||
tcltkshortcuts = []
|
||||
if msilib.Win64:
|
||||
bitted = "64 bit"
|
||||
else:
|
||||
bitted = "32 bit"
|
||||
if have_tcl:
|
||||
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"),
|
||||
("IDLE", "MenuDir",
|
||||
"IDLE|IDLE (Python "+short_version+" GUI - "+bitted+")",
|
||||
"pythonw.exe", tcltk.id, r'"[TARGETDIR]Lib\idlelib\idle.pyw"',
|
||||
None, None, "python_icon.exe", 0, None, "TARGETDIR"),
|
||||
]
|
||||
add_data(db, "Shortcut",
|
||||
tcltkshortcuts +
|
||||
[# Advertised shortcuts: targets are features, not files
|
||||
("Python", "MenuDir", "PYTHON|Python (command line)", "python.exe",
|
||||
default_feature.id, None, None, None, "python_icon.exe", 2, None, "TARGETDIR"),
|
||||
("Python", "MenuDir",
|
||||
"PYTHON|Python "+short_version+" (command line - "+bitted+")",
|
||||
"python.exe", default_feature.id, None, None, None,
|
||||
"python_icon.exe", 2, None, "TARGETDIR"),
|
||||
# Advertising the Manual breaks on (some?) Win98, and the shortcut lacks an
|
||||
# icon first.
|
||||
#("Manual", "MenuDir", "MANUAL|Python Manuals", "documentation",
|
||||
# htmlfiles.id, None, None, None, None, None, None, None),
|
||||
## Non-advertised shortcuts: must be associated with a registry component
|
||||
("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",
|
||||
("Manual", "MenuDir", "MANUAL|Python "+short_version+" Manuals",
|
||||
"REGISTRY.doc", "[#%s]" % docfile,
|
||||
None, None, None, None, None, None, None),
|
||||
("PyDoc", "MenuDir",
|
||||
"MODDOCS|Python "+short_version+" Docs Server (pydoc - "+
|
||||
bitted+")", "python.exe", default_feature.id, r'-m pydoc -b',
|
||||
None, None, "python_icon.exe", 0, None, "TARGETDIR"),
|
||||
("Uninstall", "MenuDir", "UNINST|Uninstall Python "+
|
||||
short_version+" ("+bitted+")", "REGISTRY",
|
||||
SystemFolderName+"msiexec", "/x%s" % product_code,
|
||||
None, None, None, None, None, None),
|
||||
])
|
||||
|
|
Loading…
Reference in New Issue