[Python-checkins] r72759 - in python/branches/release26-maint: Lib/distutils/command/build_ext.py Lib/distutils/tests/test_build_ext.py Misc/NEWS

Mon May 18 10:05:17 CEST 2009

Author: tarek.ziade
Date: Mon May 18 10:05:17 2009
New Revision: 72759
Log:
Merged revisions 72758 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk
........
 r72758 | tarek.ziade | 2009年05月18日 10:03:37 +0200 (2009年5月18日) | 1 line
 
 Fixed the library extension when distutils build_ext is used inplace
........
Modified:
 python/branches/release26-maint/ (props changed)
 python/branches/release26-maint/Lib/distutils/command/build_ext.py
 python/branches/release26-maint/Lib/distutils/tests/test_build_ext.py
 python/branches/release26-maint/Misc/NEWS
Modified: python/branches/release26-maint/Lib/distutils/command/build_ext.py
==============================================================================

--- python/branches/release26-maint/Lib/distutils/command/build_ext.py	(original)
+++ python/branches/release26-maint/Lib/distutils/command/build_ext.py	Mon May 18 10:05:17 2009
@@ -635,7 +635,8 @@
 base = modpath[-1]
 build_py = self.get_finalized_command('build_py')
 package_dir = os.path.abspath(build_py.get_package_dir(package))
- return os.path.join(package_dir, base)
+ filename = self.get_ext_filename(ext_name)
+ return os.path.join(package_dir, filename)
 else:
 filename = self.get_ext_filename(ext_name)
 return os.path.join(self.build_lib, filename)
@@ -649,12 +650,11 @@
 else:
 return self.package + '.' + ext_name
 
- def get_ext_filename (self, ext_name):
+ def get_ext_filename(self, ext_name):
 r"""Convert the name of an extension (eg. "foo.bar") into the name
 of the file from which it will be loaded (eg. "foo/bar.so", or
 "foo\bar.pyd").
 """
-
 from distutils.sysconfig import get_config_var
 ext_path = string.split(ext_name, '.')
 # OS/2 has an 8 character module (extension) limit :-(
Modified: python/branches/release26-maint/Lib/distutils/tests/test_build_ext.py
==============================================================================
--- python/branches/release26-maint/Lib/distutils/tests/test_build_ext.py	(original)
+++ python/branches/release26-maint/Lib/distutils/tests/test_build_ext.py	Mon May 18 10:05:17 2009
@@ -17,12 +17,6 @@
 # Don't load the xx module more than once.
 ALREADY_TESTED = False
 
-if sys.platform != 'win32':
- UNDER_MSVC8 = False
-else:
- from distutils.msvccompiler import get_build_version
- UNDER_MSVC8 = get_build_version() < 8.0
-
 class BuildExtTestCase(support.TempdirManager,
 support.LoggingSilencer,
 unittest.TestCase):
@@ -267,6 +261,8 @@
 finally:
 os.chdir(old_wd)
 self.assert_(os.path.exists(so_file))
+ self.assertEquals(os.path.splitext(so_file)[-1],
+ sysconfig.get_config_var('SO'))
 so_dir = os.path.dirname(so_file)
 self.assertEquals(so_dir, other_tmp_dir)
 
@@ -274,6 +270,8 @@
 cmd.run()
 so_file = cmd.get_outputs()[0]
 self.assert_(os.path.exists(so_file))
+ self.assertEquals(os.path.splitext(so_file)[-1],
+ sysconfig.get_config_var('SO'))
 so_dir = os.path.dirname(so_file)
 self.assertEquals(so_dir, cmd.build_lib)
 
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Mon May 18 10:05:17 2009
@@ -198,6 +198,9 @@
 Library
 -------
 
+- Issue #6046: Fixed the library extension when distutils build_ext is used
+ inplace. Initial patch by Roumen Petrov.
+
 - Issue #6022: a test file was created in the current working directory by
 test_get_outputs in Distutils.
 
