[Python-checkins] r69488 - in python/branches/release30-maint: Lib/distutils/sysconfig.py Lib/distutils/tests/test_sysconfig.py Misc/NEWS

Tue Feb 10 13:41:19 CET 2009

Author: tarek.ziade
Date: Tue Feb 10 13:41:19 2009
New Revision: 69488
Log:
Merged revisions 69487 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r69487 | tarek.ziade | 2009年02月10日 13:36:33 +0100 (2009年2月10日) | 9 lines
 
 Merged revisions 69485 via svnmerge from 
 svn+ssh://pythondev@svn.python.org/python/trunk
 
 ........
 r69485 | tarek.ziade | 2009年02月10日 13:31:09 +0100 (2009年2月10日) | 1 line
 
 Fixed #3386: the optional prefix argument was ignored under OS2 and NT in distutils.sysconfig.get_python_lib
 ........
................
Modified:
 python/branches/release30-maint/ (props changed)
 python/branches/release30-maint/Lib/distutils/sysconfig.py
 python/branches/release30-maint/Lib/distutils/tests/test_sysconfig.py
 python/branches/release30-maint/Misc/NEWS
Modified: python/branches/release30-maint/Lib/distutils/sysconfig.py
==============================================================================

--- python/branches/release30-maint/Lib/distutils/sysconfig.py	(original)
+++ python/branches/release30-maint/Lib/distutils/sysconfig.py	Tue Feb 10 13:41:19 2009
@@ -127,7 +127,7 @@
 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:
 if standard_lib:
@@ -141,9 +141,9 @@
 return os.path.join(prefix, "Lib", "site-packages")
 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(
 "I don't know where Python installs its library "
Modified: python/branches/release30-maint/Lib/distutils/tests/test_sysconfig.py
==============================================================================
--- python/branches/release30-maint/Lib/distutils/tests/test_sysconfig.py	(original)
+++ python/branches/release30-maint/Lib/distutils/tests/test_sysconfig.py	Tue Feb 10 13:41:19 2009
@@ -17,6 +17,8 @@
 # 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):
 # The check for srcdir is copied from Python's setup.py,
Modified: python/branches/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Tue Feb 10 13:41:19 2009
@@ -116,6 +116,9 @@
 Library
 -------
 
+- Issue #3386: distutils.sysconfig.get_python_lib prefix argument was ignored
+ under NT and OS2. Patch by Philip Jenvey.
+
 - Issue #4890: Handle empty text search pattern in Tkinter.Text.search.
 
 - Partial fix to issue #1731706: memory leak in Tkapp_Call when calling
