Commit 6504c664 authored by Tarek Ziadé's avatar Tarek Ziadé

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'
........
parent 21dc5bac
...@@ -726,7 +726,7 @@ class build_ext(Command): ...@@ -726,7 +726,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:
......
...@@ -299,7 +299,7 @@ class BuildExtTestCase(TempdirManager, ...@@ -299,7 +299,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]})
......
...@@ -888,6 +888,9 @@ Core and Builtins ...@@ -888,6 +888,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 #6377: Enabled the compiler option, and deprecate its usage as an - Issue #6377: Enabled the compiler option, and deprecate its usage as an
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment