Closes #23437: Make user scripts directory versioned on Windows (patch by pmoore)

zooba · zooba · commit 17be514d0a9a · 2015-02-14T09:50:59.000-08:00
diff --git a/Doc/install/index.rst b/Doc/install/index.rst
@@ -361,7 +361,7 @@ And here are the values used on Windows:
 Type of file    Installation directory
 =============== ===========================================================
 modules         :file:`{userbase}\\Python{XY}\\site-packages`
-scripts         :file:`{userbase}\\Scripts`
+scripts         :file:`{userbase}\\Python{XY}\\Scripts`
 data            :file:`{userbase}`
 C headers       :file:`{userbase}\\Python{XY}\\Include\\{distname}`
 =============== ===========================================================
diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py
@@ -51,7 +51,7 @@
         'purelib': '$usersite',
         'platlib': '$usersite',
         'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',
-        'scripts': '$userbase/Scripts',
+        'scripts': '$userbase/Python$py_version_nodot/Scripts',
         'data'   : '$userbase',
         }
 
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
@@ -57,7 +57,7 @@
         'purelib': '{userbase}/Python{py_version_nodot}/site-packages',
         'platlib': '{userbase}/Python{py_version_nodot}/site-packages',
         'include': '{userbase}/Python{py_version_nodot}/Include',
-        'scripts': '{userbase}/Scripts',
+        'scripts': '{userbase}/Python{py_version_nodot}/Scripts',
         'data': '{userbase}',
         },
     'posix_user': {
diff --git a/Tools/scripts/win_add2path.py b/Tools/scripts/win_add2path.py
@@ -22,7 +22,8 @@ def modify():
     scripts = os.path.join(pythonpath, "Scripts")
     appdata = os.environ["APPDATA"]
     if hasattr(site, "USER_SITE"):
-        userpath = site.USER_SITE.replace(appdata, "%APPDATA%")
+        usersite = site.USER_SITE.replace(appdata, "%APPDATA%")
+        userpath = os.path.dirname(usersite)
         userscripts = os.path.join(userpath, "Scripts")
     else:
         userscripts = None

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@`
`51`	`51`	`'purelib': '$usersite',`
`52`	`52`	`'platlib': '$usersite',`
`53`	`53`	`'headers': '$userbase/Python$py_version_nodot/Include/$dist_name',`
`54`		`- 'scripts': '$userbase/Scripts',`
	`54`	`+ 'scripts': '$userbase/Python$py_version_nodot/Scripts',`
`55`	`55`	`'data' : '$userbase',`
`56`	`56`	`}`
`57`	`57`