mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 07:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #3386: the optional prefix argument was ignored under OS2 and NT in distutils.sysconfig.get_python_lib

Browse source
This commit is contained in:
Tarek Ziadé 2009-02-10 12:31:09 +00:00
parent 28d108893c
commit 74fbf60e8c
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/distutils/sysconfig.py
View file

@ -132,7 +132,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
if get_python_version() < "2.2": if get_python_version() < "2.2":
return prefix return prefix
else: else:
return os.path.join(PREFIX, "Lib", "site-packages") return os.path.join(prefix, "Lib", "site-packages")
elif os.name == "mac": elif os.name == "mac":
if plat_specific: if plat_specific:
@ -148,9 +148,9 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
elif os.name == "os2": elif os.name == "os2":
if standard_lib: if standard_lib:
return os.path.join(PREFIX, "Lib") return os.path.join(prefix, "Lib")
else: else:
return os.path.join(PREFIX, "Lib", "site-packages") return os.path.join(prefix, "Lib", "site-packages")
else: else:
raise DistutilsPlatformError( raise DistutilsPlatformError(

2
Lib/distutils/tests/test_sysconfig.py
View file

@ -26,6 +26,8 @@ class SysconfigTestCase(unittest.TestCase):
# XXX doesn't work on Linux when Python was never installed before # XXX doesn't work on Linux when Python was never installed before
#self.assert_(os.path.isdir(lib_dir), lib_dir) #self.assert_(os.path.isdir(lib_dir), lib_dir)
# test for pythonxx.lib? # test for pythonxx.lib?
self.assertNotEqual(sysconfig.get_python_lib(),
sysconfig.get_python_lib(prefix=TESTFN))
def test_get_python_inc(self): def test_get_python_inc(self):
inc_dir = sysconfig.get_python_inc() inc_dir = sysconfig.get_python_inc()

3
Misc/NEWS
View file

@ -152,6 +152,9 @@ Core and Builtins
Library Library
------- -------
- Issue #3386: distutils.sysconfig.get_python_lib prefix argument was ignored
under NT and OS2. Patch by Philip Jenvey.
- Issue #5128: Make compileall properly inspect bytecode to determine if needs - Issue #5128: Make compileall properly inspect bytecode to determine if needs
to be recreated. This avoids a timing hole thanks to the old reliance on the to be recreated. This avoids a timing hole thanks to the old reliance on the
ctime of the files involved. ctime of the files involved.