mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-05 14:41:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 72758 via svnmerge from

Browse source 
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
........
This commit is contained in:
Tarek Ziadé 2009-05-18 08:05:17 +00:00
parent 5526ef303a
commit 482c220ace
3 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/distutils/command/build_ext.py
View file

@ -635,7 +635,8 @@ class build_ext (Command):
base = modpath[-1] base = modpath[-1]
build_py = self.get_finalized_command('build_py') build_py = self.get_finalized_command('build_py')
package_dir = os.path.abspath(build_py.get_package_dir(package)) 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: else:
filename = self.get_ext_filename(ext_name) filename = self.get_ext_filename(ext_name)
return os.path.join(self.build_lib, filename) return os.path.join(self.build_lib, filename)
@ -649,12 +650,11 @@ class build_ext (Command):
else: else:
return self.package + '.' + ext_name 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 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 of the file from which it will be loaded (eg. "foo/bar.so", or
"foo\bar.pyd"). "foo\bar.pyd").
""" """
from distutils.sysconfig import get_config_var from distutils.sysconfig import get_config_var
ext_path = string.split(ext_name, '.') ext_path = string.split(ext_name, '.')
# OS/2 has an 8 character module (extension) limit :-( # OS/2 has an 8 character module (extension) limit :-(

10
Lib/distutils/tests/test_build_ext.py
View file

@ -17,12 +17,6 @@ from test import test_support
# Don't load the xx module more than once. # Don't load the xx module more than once.
ALREADY_TESTED = False 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, class BuildExtTestCase(support.TempdirManager,
support.LoggingSilencer, support.LoggingSilencer,
unittest.TestCase): unittest.TestCase):
@ -267,6 +261,8 @@ class BuildExtTestCase(support.TempdirManager,
finally: finally:
os.chdir(old_wd) os.chdir(old_wd)
self.assert_(os.path.exists(so_file)) 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) so_dir = os.path.dirname(so_file)
self.assertEquals(so_dir, other_tmp_dir) self.assertEquals(so_dir, other_tmp_dir)
@ -274,6 +270,8 @@ class BuildExtTestCase(support.TempdirManager,
cmd.run() cmd.run()
so_file = cmd.get_outputs()[0] so_file = cmd.get_outputs()[0]
self.assert_(os.path.exists(so_file)) 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) so_dir = os.path.dirname(so_file)
self.assertEquals(so_dir, cmd.build_lib) self.assertEquals(so_dir, cmd.build_lib)

3
Misc/NEWS
View file

@ -198,6 +198,9 @@ Core and Builtins
Library 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 - Issue #6022: a test file was created in the current working directory by
test_get_outputs in Distutils. test_get_outputs in Distutils.