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

bpo-36649: Remove trailing spaces for registry keys when installed via the Store (GH-12865)

This commit is contained in:
Steve Dower 2019-04-17 14:31:32 -07:00 committed by GitHub
parent 5c75f37d47
commit 4c3efd9cd0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Misc/NEWS.d/next/Windows/2019-04-17-11-39-24.bpo-36649.arbzIo.rst Normal file
View File

@ -0,0 +1 @@
Remove trailing spaces for registry keys when installed via the Store.

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

@ -159,21 +159,20 @@ 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": {
# I have no idea why the trailing spaces are needed, but they seem to be needed. "": "[{AppVPackageRoot}]",
"": "[{AppVPackageRoot}][ ]", "ExecutablePath": "[{AppVPackageRoot}]\\python.exe",
"ExecutablePath": "[{AppVPackageRoot}]python.exe[ ]", "WindowedExecutablePath": "[{AppVPackageRoot}]\\pythonw.exe",
"WindowedExecutablePath": "[{AppVPackageRoot}]pythonw.exe[ ]",
}, },
"Help": { "Help": {
"Main Python Documentation": { "Main Python Documentation": {
"_condition": lambda ns: ns.include_chm, "_condition": lambda ns: ns.include_chm,
"": "[{{AppVPackageRoot}}]Doc\\{}[ ]".format( "": "[{{AppVPackageRoot}}]\\Doc\\{}".format(
PYTHON_CHM_NAME PYTHON_CHM_NAME
), ),
}, },
"Local Python Documentation": { "Local Python Documentation": {
"_condition": lambda ns: ns.include_html_doc, "_condition": lambda ns: ns.include_html_doc,
"": "[{AppVPackageRoot}]Doc\\html\\index.html[ ]", "": "[{AppVPackageRoot}]\\Doc\\html\\index.html",
}, },
"Online Python Documentation": { "Online Python Documentation": {
"": "https://docs.python.org/{}".format(VER_DOT) "": "https://docs.python.org/{}".format(VER_DOT)
@ -181,7 +180,7 @@ REGISTRY = {
}, },
"Idle": { "Idle": {
"_condition": lambda ns: ns.include_idle, "_condition": lambda ns: ns.include_idle,
"": "[{AppVPackageRoot}]Lib\\idlelib\\idle.pyw[ ]", "": "[{AppVPackageRoot}]\\Lib\\idlelib\\idle.pyw",
}, },
} }
} }