mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merged revisions 73948 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r73948 | tarek.ziade | 2009-07-11 12:59:56 +0200 (Sat, 11 Jul 2009) | 9 lines

  Merged revisions 73946 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r73946 | tarek.ziade | 2009-07-11 12:55:27 +0200 (Sat, 11 Jul 2009) | 1 line

    fixed #6459: distutils.command.build_ext.get_export_symbols now uses 'PyInit'
  ........
................
This commit is contained in:
Tarek Ziadé 2009-07-11 11:01:14 +00:00
parent 041b3baf53
commit 24448fa86e
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -679,7 +679,7 @@ class build_ext(Command):
"""Return the list of symbols that a shared extension has to """Return the list of symbols that a shared extension has to
export. This either uses 'ext.export_symbols' or, if it's not export. This either uses 'ext.export_symbols' or, if it's not
provided, "PyInit_" + module_name. Only relevant on Windows, where provided, "PyInit_" + module_name. Only relevant on Windows, where
the .pyd file (DLL) must export the module "init" function. the .pyd file (DLL) must export the module "PyInit_" function.
""" """
initfunc_name = "PyInit_" + ext.name.split('.')[-1] initfunc_name = "PyInit_" + ext.name.split('.')[-1]
if initfunc_name not in ext.export_symbols: if initfunc_name not in ext.export_symbols:

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

@ -296,7 +296,7 @@ class BuildExtTestCase(TempdirManager,
def test_get_outputs(self): def test_get_outputs(self):
tmp_dir = self.mkdtemp() tmp_dir = self.mkdtemp()
c_file = os.path.join(tmp_dir, 'foo.c') c_file = os.path.join(tmp_dir, 'foo.c')
self.write_file(c_file, 'void initfoo(void) {};\n') self.write_file(c_file, 'void PyInit_foo(void) {};\n')
ext = Extension('foo', [c_file], optional=False) ext = Extension('foo', [c_file], optional=False)
dist = Distribution({'name': 'xx', dist = Distribution({'name': 'xx',
'ext_modules': [ext]}) 'ext_modules': [ext]})

3
Misc/NEWS
View file

@ -869,6 +869,9 @@ Core and Builtins
Library Library
------- -------
- Issue #6459: distutils.command.build_ext.get_export_symbols now uses the
"PyInit" prefix, rather than "init".
- Issue #6455: Fixed test_build_ext under win32. - Issue #6455: Fixed test_build_ext under win32.
- Issue #6413: Fixed the log level in distutils.dist for announce. - Issue #6413: Fixed the log level in distutils.dist for announce.