From bc3f3c9eed153ca9dde5d436ff9935b670959956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tarek=20Ziad=C3=A9?= Date: Sat, 11 Jul 2009 17:22:14 +0000 Subject: Merged revisions 73954 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r73954 | tarek.ziade | 2009-07-11 19:21:00 +0200 (Sat, 11 Jul 2009) | 1 line reverted changes for #6459 (doesn't apply on 2.x) ........ --- Lib/distutils/command/build_ext.py | 6 +++--- Lib/distutils/tests/test_build_ext.py | 2 +- Misc/NEWS | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index ccc3fe5..db82f1d 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -680,10 +680,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, "PyInit_" + module_name. Only relevant on Windows, where - the .pyd file (DLL) must export the module "PyInit_" function. + provided, "init" + module_name. Only relevant on Windows, where + the .pyd file (DLL) must export the module "init" function. """ - initfunc_name = "PyInit_" + ext.name.split('.')[-1] + initfunc_name = "init" + 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 d992548..d071648 100644 --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -233,7 +233,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 PyInit_foo(void) {};\n') + self.write_file(c_file, 'void init_foo(void) {};\n') ext = Extension('foo', [c_file]) dist = Distribution({'name': 'xx', 'ext_modules': [ext]}) diff --git a/Misc/NEWS b/Misc/NEWS index 9670a3f..fee9d61 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -265,9 +265,6 @@ Library - Issue #2622: Fixed an ImportError when importing email.messsage from a standalone application built with py2exe or py2app. -- 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 #6403: Fixed package path usage in build_ext. -- cgit v0.12