mirror of
https://github.com/python/cpython.git
synced 2025-07-30 14:44:10 +00:00
Fixed #3386: the optional prefix argument was ignored under OS2 and NT in distutils.sysconfig.get_python_lib
This commit is contained in:
parent
28d108893c
commit
74fbf60e8c
3 changed files with 8 additions and 3 deletions
|
@ -132,7 +132,7 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
|
|||
if get_python_version() < "2.2":
|
||||
return prefix
|
||||
else:
|
||||
return os.path.join(PREFIX, "Lib", "site-packages")
|
||||
return os.path.join(prefix, "Lib", "site-packages")
|
||||
|
||||
elif os.name == "mac":
|
||||
if plat_specific:
|
||||
|
@ -148,9 +148,9 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
|
|||
|
||||
elif os.name == "os2":
|
||||
if standard_lib:
|
||||
return os.path.join(PREFIX, "Lib")
|
||||
return os.path.join(prefix, "Lib")
|
||||
else:
|
||||
return os.path.join(PREFIX, "Lib", "site-packages")
|
||||
return os.path.join(prefix, "Lib", "site-packages")
|
||||
|
||||
else:
|
||||
raise DistutilsPlatformError(
|
||||
|
|
|
@ -26,6 +26,8 @@ class SysconfigTestCase(unittest.TestCase):
|
|||
# XXX doesn't work on Linux when Python was never installed before
|
||||
#self.assert_(os.path.isdir(lib_dir), lib_dir)
|
||||
# test for pythonxx.lib?
|
||||
self.assertNotEqual(sysconfig.get_python_lib(),
|
||||
sysconfig.get_python_lib(prefix=TESTFN))
|
||||
|
||||
def test_get_python_inc(self):
|
||||
inc_dir = sysconfig.get_python_inc()
|
||||
|
|
|
@ -152,6 +152,9 @@ Core and Builtins
|
|||
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
|
||||
to be recreated. This avoids a timing hole thanks to the old reliance on the
|
||||
ctime of the files involved.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue