diff options
| author | Tarek Ziadé <ziade.tarek@gmail.com> | 2010-05-19 22:20:14 (GMT) |
|---|---|---|
| committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2010-05-19 22:20:14 (GMT) |
| commit | 8f692275e9c2cd4e5f7959328f6f9da8538ffe9e (patch) | |
| tree | 3819cd4077c4e03e2d63924e212c4c2c83c3396b | |
| parent | 4a769059beb9c29548f309fcac85f4eef7097f27 (diff) | |
| download | cpython-8f692275e9c2cd4e5f7959328f6f9da8538ffe9e.zip cpython-8f692275e9c2cd4e5f7959328f6f9da8538ffe9e.tar.gz cpython-8f692275e9c2cd4e5f7959328f6f9da8538ffe9e.tar.bz2 | |
#8759: Fixed user paths in sysconfig for posix and os2 schemes
| -rw-r--r-- | Lib/sysconfig.py | 16 | ||||
| -rw-r--r-- | Lib/test/test_sysconfig.py | 11 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
3 files changed, 20 insertions, 9 deletions
diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py index 2ae761c..bbe331e 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 1e12a45..88722de 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) @@ -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. |