[Python-checkins] cpython: Closes #23437: Make user scripts directory versioned on Windows (patch by

Sat Feb 14 18:53:11 CET 2015

https://hg.python.org/cpython/rev/add998f98e31
changeset: 94608:add998f98e31
user: Steve Dower <steve.dower at microsoft.com>
date: Sat Feb 14 09:50:59 2015 -0800
summary:
 Closes #23437: Make user scripts directory versioned on Windows (patch by pmoore)
files:
 Doc/install/index.rst | 2 +-
 Lib/distutils/command/install.py | 2 +-
 Lib/sysconfig.py | 2 +-
 Tools/scripts/win_add2path.py | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Doc/install/index.rst b/Doc/install/index.rst
--- a/Doc/install/index.rst
+++ b/Doc/install/index.rst
@@ -361,7 +361,7 @@
 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
--- 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
--- 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
--- a/Tools/scripts/win_add2path.py
+++ b/Tools/scripts/win_add2path.py
@@ -22,7 +22,8 @@
 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
-- 
Repository URL: https://hg.python.org/cpython
