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

zooba · web-flow · commit 4c3efd9cd071 · 2019-04-17T14:31:32.000-07:00
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
@@ -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
@@ -159,29 +159,28 @@ 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)
                 },
             },
             "Idle": {
                 "_condition": lambda ns: ns.include_idle,
-                "": "[{AppVPackageRoot}]Lib\\idlelib\\idle.pyw[                    ]",
+                "": "[{AppVPackageRoot}]\\Lib\\idlelib\\idle.pyw",
             },
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Remove trailing spaces for registry keys when installed via the Store.`