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

[tarek.ziade]

Author: tarek.ziade
Date: Mon May 18 10:11:23 2009
New Revision: 72763

Log:
Merged revisions 72760 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r72760 | tarek.ziade | 2009-05-18 10:07:46 +0200 (Mon, 18 May 2009) | 9 lines
  
  Merged revisions 72758 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r72758 | tarek.ziade | 2009-05-18 10:03:37 +0200 (Mon, 18 May 2009) | 1 line
    
    Fixed the library extension when distutils build_ext is used inplace
  ........
................


Modified:
   python/branches/release30-maint/   (props changed)
   python/branches/release30-maint/Lib/distutils/command/build_ext.py
   python/branches/release30-maint/Lib/distutils/tests/test_build_ext.py
   python/branches/release30-maint/Misc/NEWS

Modified: python/branches/release30-maint/Lib/distutils/command/build_ext.py
==============================================================================
--- python/branches/release30-maint/Lib/distutils/command/build_ext.py	(original)
+++ python/branches/release30-maint/Lib/distutils/command/build_ext.py	Mon May 18 10:11:23 2009
@@ -620,7 +620,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)

Modified: python/branches/release30-maint/Lib/distutils/tests/test_build_ext.py
==============================================================================
--- python/branches/release30-maint/Lib/distutils/tests/test_build_ext.py	(original)
+++ python/branches/release30-maint/Lib/distutils/tests/test_build_ext.py	Mon May 18 10:11:23 2009
@@ -18,12 +18,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(TempdirManager,
                        LoggingSilencer,
                        unittest.TestCase):
@@ -238,8 +232,6 @@
         self.assertEquals(cmd.compiler, 'unix')
 
     def test_get_outputs(self):
-        if UNDER_MSVC8:
-            return
         tmp_dir = self.mkdtemp()
         c_file = os.path.join(tmp_dir, 'foo.c')
         self.write_file(c_file, 'void initfoo(void) {};\n')
@@ -268,6 +260,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)
 
@@ -275,6 +269,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/release30-maint/Misc/NEWS
==============================================================================
--- python/branches/release30-maint/Misc/NEWS	(original)
+++ python/branches/release30-maint/Misc/NEWS	Mon May 18 10:11:23 2009
@@ -285,6 +285,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.