diff options
author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-07-11 10:55:27 (GMT) |
---|---|---|
committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-07-11 10:55:27 (GMT) |
commit | 23a3775cc8eef828edec75ed19bd630d03fb17a9 (patch) | |
tree | f7e398a5d451714f515053f6b1b07d50f5a6cabf /Lib/distutils | |
parent | b7e14eda6e4c171138c4c53f58fd54461e84fbb5 (diff) | |
download | cpython-23a3775cc8eef828edec75ed19bd630d03fb17a9.zip cpython-23a3775cc8eef828edec75ed19bd630d03fb17a9.tar.gz cpython-23a3775cc8eef828edec75ed19bd630d03fb17a9.tar.bz2 |
fixed #6459: distutils.command.build_ext.get_export_symbols now uses 'PyInit'
Diffstat (limited to 'Lib/distutils')
-rw-r--r-- | Lib/distutils/command/build_ext.py | 6 | ||||
-rw-r--r-- | Lib/distutils/tests/test_build_ext.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index 0c79476..17cb26b 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -732,10 +732,10 @@ class build_ext(Command): def get_export_symbols(self, ext): """Return the list of symbols that a shared extension has to export. This either uses 'ext.export_symbols' or, if it's not - provided, "init" + module_name. Only relevant on Windows, where - the .pyd file (DLL) must export the module "init" function. + provided, "PyInit_" + module_name. Only relevant on Windows, where + the .pyd file (DLL) must export the module "PyInit_" function. """ - initfunc_name = "init" + ext.name.split('.')[-1] + initfunc_name = "PyInit_" + ext.name.split('.')[-1] if initfunc_name not in ext.export_symbols: ext.export_symbols.append(initfunc_name) return ext.export_symbols diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py index 4c09dd8..7886c79 100644 --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -299,7 +299,7 @@ class BuildExtTestCase(support.TempdirManager, def test_get_outputs(self): tmp_dir = self.mkdtemp() 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) dist = Distribution({'name': 'xx', 'ext_modules': [ext]}) |