From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Wed, 19 May 2010 22:20:14 +0000 (+0000)
Subject: #8759: Fixed user paths in sysconfig for posix and os2 schemes
X-Git-Tag: v2.7rc1~128
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f692275e9c2cd4e5f7959328f6f9da8538ffe9e;p=python

#8759: Fixed user paths in sysconfig for posix and os2 schemes
---

diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
index 2ae761cad1..bbe331e02d 100644
--- a/Lib/sysconfig.py
+++ b/Lib/sysconfig.py
@@ -47,10 +47,10 @@ _INSTALL_SCHEMES = {
         'data'   : '{base}',
         },
     'os2_home': {
-        'stdlib': '{userbase}/lib/python/{py_version_short}',
-        'platstdlib': '{userbase}/lib/python/{py_version_short}',
-        'purelib': '{userbase}/lib/python/{py_version_short}/site-packages',
-        'platlib': '{userbase}/lib/python/{py_version_short}/site-packages',
+        'stdlib': '{userbase}/lib/python{py_version_short}',
+        'platstdlib': '{userbase}/lib/python{py_version_short}',
+        'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
+        'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
         'include': '{userbase}/include/python{py_version_short}',
         'scripts': '{userbase}/bin',
         'data'   : '{userbase}',
@@ -65,10 +65,10 @@ _INSTALL_SCHEMES = {
         'data'   : '{userbase}',
         },
     'posix_user': {
-        'stdlib': '{userbase}/lib/python/{py_version_short}',
-        'platstdlib': '{userbase}/lib/python/{py_version_short}',
-        'purelib': '{userbase}/lib/python/{py_version_short}/site-packages',
-        'platlib': '{userbase}/lib/python/{py_version_short}/site-packages',
+        'stdlib': '{userbase}/lib/python{py_version_short}',
+        'platstdlib': '{userbase}/lib/python{py_version_short}',
+        'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
+        'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
         'include': '{userbase}/include/python{py_version_short}',
         'scripts': '{userbase}/bin',
         'data'   : '{userbase}',
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index 1e12a454e9..88722de5ad 100644
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -17,7 +17,7 @@ import sysconfig
 from sysconfig import (get_paths, get_platform, get_config_vars,
                        get_path, get_path_names, _INSTALL_SCHEMES,
                        _get_default_scheme, _expand_vars,
-                       get_scheme_names)
+                       get_scheme_names, get_config_var)
 
 class TestSysConfig(unittest.TestCase):
 
@@ -255,6 +255,15 @@ class TestSysConfig(unittest.TestCase):
         finally:
             unlink(link)
 
+    def test_user_similar(self):
+        # Issue 8759 : make sure the posix scheme for the users
+        # is similar to the global posix_prefix one
+        base = get_config_var('base')
+        user = get_config_var('userbase')
+        for name in ('stdlib', 'platstdlib', 'purelib', 'platlib'):
+            global_path = get_path(name, 'posix_prefix')
+            user_path = get_path(name, 'posix_user')
+            self.assertEquals(user_path, global_path.replace(base, user))
 
 def test_main():
     run_unittest(TestSysConfig)
diff --git a/Misc/NEWS b/Misc/NEWS
index 5cbc7670c3..b81eb70aa6 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #8759: Fixed user paths in sysconfig for posix and os2 schemes.
+
 - Issue #1285086: Speed up urllib.quote and urllib.unquote for simple cases.
 
 - Issue #8688: Distutils now recalculates MANIFEST everytime.