Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zooba merged 3 commits into from
Aug 7, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9a9345
bpo-37734: Fix use of registry values to launch Python from Microsoft…
zooba Aug 6, 2019
710bd98
Revert irrelevant change
zooba Aug 6, 2019
859f968
Apply punctuation
zooba Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2019-08-06-09-35-12.bpo-37734.EoJ9Nh.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix use of registry values to launch Python from Microsoft Store app.
10 changes: 8 additions & 2 deletions PC/layout/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,19 +153,25 @@ def in_build(f, dest="", new_name=None):
yield "libs/" + n + ".lib", lib

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("pythonw_uwp.exe", new_name="pythonw")
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("pythonw.exe", new_name="pythonw")

yield from in_build(PYTHON_DLL_NAME)

if ns.include_launchers and ns.include_appxmanifest:
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:
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:
yield from in_build(PYTHON_STABLE_DLL_NAME)
Expand Down
14 changes: 7 additions & 7 deletions PC/layout/support/appxmanifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@
"SysVersion": VER_DOT,
"Version": "{}.{}.{}".format(VER_MAJOR, VER_MINOR, VER_MICRO),
"InstallPath": {
"": "[{AppVPackageRoot}]",
"ExecutablePath": "[{AppVPackageRoot}]\\python.exe",
"WindowedExecutablePath": "[{AppVPackageRoot}]\\pythonw.exe",
"": "[{{AppVPackageRoot}}]",
"ExecutablePath": "[{{AppVPackageRoot}}]\\python{}.exe".format(VER_DOT),
"WindowedExecutablePath": "[{{AppVPackageRoot}}]\\pythonw{}.exe".format(VER_DOT),
},
"Help": {
"Main Python Documentation": {
Expand Down Expand Up @@ -395,7 +395,7 @@ def get_appxmanifest(ns):
ns,
xml,
"Python",
"python",
"python{}".format(VER_DOT),
["python", "python{}".format(VER_MAJOR), "python{}".format(VER_DOT)],
PYTHON_VE_DATA,
"console",
Expand All @@ -406,7 +406,7 @@ def get_appxmanifest(ns):
ns,
xml,
"PythonW",
"pythonw",
"pythonw{}".format(VER_DOT),
["pythonw", "pythonw{}".format(VER_MAJOR), "pythonw{}".format(VER_DOT)],
PYTHONW_VE_DATA,
"windows",
Expand All @@ -418,7 +418,7 @@ def get_appxmanifest(ns):
ns,
xml,
"Pip",
"pip",
"pip{}".format(VER_DOT),
["pip", "pip{}".format(VER_MAJOR), "pip{}".format(VER_DOT)],
PIP_VE_DATA,
"console",
Expand All @@ -430,7 +430,7 @@ def get_appxmanifest(ns):
ns,
xml,
"Idle",
"idle",
"idle{}".format(VER_DOT),
["idle", "idle{}".format(VER_MAJOR), "idle{}".format(VER_DOT)],
IDLE_VE_DATA,
"windows",
Expand Down