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

[Miss Islington (bot)]

https://github.com/python/cpython/commit/0d4f16d283fe3b8a183775ac7ac193988d971ad5
commit: 0d4f16d283fe3b8a183775ac7ac193988d971ad5
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-04-17T14:52:14-07:00
summary:

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

(cherry picked from commit 4c3efd9cd07194b5db2a60ae5951134cda8b69db)

Co-authored-by: Steve Dower <steve.dower at microsoft.com>

files:
A Misc/NEWS.d/next/Windows/2019-04-17-11-39-24.bpo-36649.arbzIo.rst
M PC/layout/support/appxmanifest.py

diff --git a/Misc/NEWS.d/next/Windows/2019-04-17-11-39-24.bpo-36649.arbzIo.rst b/Misc/NEWS.d/next/Windows/2019-04-17-11-39-24.bpo-36649.arbzIo.rst
new file mode 100644
index 000000000000..8b44feb9f4c0
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2019-04-17-11-39-24.bpo-36649.arbzIo.rst
@@ -0,0 +1 @@
+Remove trailing spaces for registry keys when installed via the Store.
diff --git a/PC/layout/support/appxmanifest.py b/PC/layout/support/appxmanifest.py
index c5dda70c7ef8..49a35fa1f046 100644
--- a/PC/layout/support/appxmanifest.py
+++ b/PC/layout/support/appxmanifest.py
@@ -159,21 +159,20 @@ def public(f):
             "SysVersion": VER_DOT,
             "Version": "{}.{}.{}".format(VER_MAJOR, VER_MINOR, VER_MICRO),
             "InstallPath": {
-                # I have no idea why the trailing spaces are needed, but they seem to be needed.
-                "": "[{AppVPackageRoot}][                    ]",
-                "ExecutablePath": "[{AppVPackageRoot}]python.exe[                    ]",
-                "WindowedExecutablePath": "[{AppVPackageRoot}]pythonw.exe[                    ]",
+                "": "[{AppVPackageRoot}]",
+                "ExecutablePath": "[{AppVPackageRoot}]\\python.exe",
+                "WindowedExecutablePath": "[{AppVPackageRoot}]\\pythonw.exe",
             },
             "Help": {
                 "Main Python Documentation": {
                     "_condition": lambda ns: ns.include_chm,
-                    "": "[{{AppVPackageRoot}}]Doc\\{}[                    ]".format(
+                    "": "[{{AppVPackageRoot}}]\\Doc\\{}".format(
                         PYTHON_CHM_NAME
                     ),
                 },
                 "Local Python Documentation": {
                     "_condition": lambda ns: ns.include_html_doc,
-                    "": "[{AppVPackageRoot}]Doc\\html\\index.html[                    ]",
+                    "": "[{AppVPackageRoot}]\\Doc\\html\\index.html",
                 },
                 "Online Python Documentation": {
                     "": "https://docs.python.org/{}".format(VER_DOT)
@@ -181,7 +180,7 @@ def public(f):
             },
             "Idle": {
                 "_condition": lambda ns: ns.include_idle,
-                "": "[{AppVPackageRoot}]Lib\\idlelib\\idle.pyw[                    ]",
+                "": "[{AppVPackageRoot}]\\Lib\\idlelib\\idle.pyw",
             },
         }
     }