From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Mon, 18 May 2009 08:11:23 +0000 (+0000)
Subject: Merged revisions 72760 via svnmerge from
X-Git-Tag: 3.0~71
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3bbfcdf2e2b5fbac5fab4be25da3fb48d87593b;p=thirdparty%2FPython%2Fcpython.git

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
  ........
................
---

diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index df1c2ee6aa6e..25131eace8fd 100644
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -620,7 +620,8 @@ class build_ext(Command):
             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)
diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
index f1b4a4412f21..cbacc81c2482 100644
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -18,12 +18,6 @@ from test import support
 # 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 @@ class BuildExtTestCase(TempdirManager,
         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 @@ class BuildExtTestCase(TempdirManager,
         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 @@ class BuildExtTestCase(TempdirManager,
         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)
 
diff --git a/Misc/NEWS b/Misc/NEWS
index 13ee03e1d8b2..471e75ca967b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -285,6 +285,9 @@ Core and Builtins
 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.