traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bpo-37734: Fix use of registry values to launch Python from Microsoft Store app (GH-15146)

This commit is contained in:
Steve Dower 2019-08-07 10:49:40 -07:00 committed by GitHub
parent 362f5350eb
commit 1fab9cbfba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Windows/2019-08-06-09-35-12.bpo-37734.EoJ9Nh.rst Normal file
View File

@ -0,0 +1 @@
Fix use of registry values to launch Python from Microsoft Store app.

10
PC/layout/main.py
View File

@ -153,9 +153,15 @@ def get_layout(ns):
yield "libs/" + n + ".lib", lib yield "libs/" + n + ".lib", lib
if ns.include_appxmanifest: if ns.include_appxmanifest:
yield from in_build("python_uwp.exe", new_name="python{}".format(VER_DOT))
yield from in_build("pythonw_uwp.exe", new_name="pythonw{}".format(VER_DOT))
# For backwards compatibility, but we don't reference these ourselves.
yield from in_build("python_uwp.exe", new_name="python") yield from in_build("python_uwp.exe", new_name="python")
yield from in_build("pythonw_uwp.exe", new_name="pythonw") yield from in_build("pythonw_uwp.exe", new_name="pythonw")
else: else:
yield from in_build("python.exe", new_name="python{}".format(VER_DOT))
yield from in_build("pythonw.exe", new_name="pythonw{}".format(VER_DOT))
# For backwards compatibility, but we don't reference these ourselves.
yield from in_build("python.exe", new_name="python") yield from in_build("python.exe", new_name="python")
yield from in_build("pythonw.exe", new_name="pythonw") yield from in_build("pythonw.exe", new_name="pythonw")
@ -163,9 +169,9 @@ def get_layout(ns):
if ns.include_launchers and ns.include_appxmanifest: if ns.include_launchers and ns.include_appxmanifest:
if ns.include_pip: if ns.include_pip:
yield from in_build("python_uwp.exe", new_name="pip") yield from in_build("python_uwp.exe", new_name="pip{}".format(VER_DOT))
if ns.include_idle: if ns.include_idle:
yield from in_build("pythonw_uwp.exe", new_name="idle") yield from in_build("pythonw_uwp.exe", new_name="idle{}".format(VER_DOT))
if ns.include_stable: if ns.include_stable:
yield from in_build(PYTHON_STABLE_DLL_NAME) yield from in_build(PYTHON_STABLE_DLL_NAME)

14
PC/layout/support/appxmanifest.py
View File

@ -154,9 +154,9 @@ REGISTRY = {
"SysVersion": VER_DOT, "SysVersion": VER_DOT,
"Version": "{}.{}.{}".format(VER_MAJOR, VER_MINOR, VER_MICRO), "Version": "{}.{}.{}".format(VER_MAJOR, VER_MINOR, VER_MICRO),
"InstallPath": { "InstallPath": {
"": "[{AppVPackageRoot}]", "": "[{{AppVPackageRoot}}]",
"ExecutablePath": "[{AppVPackageRoot}]\\python.exe", "ExecutablePath": "[{{AppVPackageRoot}}]\\python{}.exe".format(VER_DOT),
"WindowedExecutablePath": "[{AppVPackageRoot}]\\pythonw.exe", "WindowedExecutablePath": "[{{AppVPackageRoot}}]\\pythonw{}.exe".format(VER_DOT),
}, },
"Help": { "Help": {
"Main Python Documentation": { "Main Python Documentation": {
@ -395,7 +395,7 @@ def get_appxmanifest(ns):
ns, ns,
xml, xml,
"Python", "Python",
"python", "python{}".format(VER_DOT),
["python", "python{}".format(VER_MAJOR), "python{}".format(VER_DOT)], ["python", "python{}".format(VER_MAJOR), "python{}".format(VER_DOT)],
PYTHON_VE_DATA, PYTHON_VE_DATA,
"console", "console",
@ -406,7 +406,7 @@ def get_appxmanifest(ns):
ns, ns,
xml, xml,
"PythonW", "PythonW",
"pythonw", "pythonw{}".format(VER_DOT),
["pythonw", "pythonw{}".format(VER_MAJOR), "pythonw{}".format(VER_DOT)], ["pythonw", "pythonw{}".format(VER_MAJOR), "pythonw{}".format(VER_DOT)],
PYTHONW_VE_DATA, PYTHONW_VE_DATA,
"windows", "windows",
@ -418,7 +418,7 @@ def get_appxmanifest(ns):
ns, ns,
xml, xml,
"Pip", "Pip",
"pip", "pip{}".format(VER_DOT),
["pip", "pip{}".format(VER_MAJOR), "pip{}".format(VER_DOT)], ["pip", "pip{}".format(VER_MAJOR), "pip{}".format(VER_DOT)],
PIP_VE_DATA, PIP_VE_DATA,
"console", "console",
@ -430,7 +430,7 @@ def get_appxmanifest(ns):
ns, ns,
xml, xml,
"Idle", "Idle",
"idle", "idle{}".format(VER_DOT),
["idle", "idle{}".format(VER_MAJOR), "idle{}".format(VER_DOT)], ["idle", "idle{}".format(VER_MAJOR), "idle{}".format(VER_DOT)],
IDLE_VE_DATA, IDLE_VE_DATA,
"windows", "windows",