diff options
| author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-07-11 10:59:56 (GMT) |
|---|---|---|
| committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-07-11 10:59:56 (GMT) |
| commit | 6504c664dc6f8e8ca2869f761286418486ab36d6 (patch) | |
| tree | f56f93c6babe2fcf8a8d6df3a9711acb64b2b26e /Lib/distutils | |
| parent | 21dc5bacad13bab4517c99e356b3b146a37d1f12 (diff) | |
| download | cpython-6504c664dc6f8e8ca2869f761286418486ab36d6.zip cpython-6504c664dc6f8e8ca2869f761286418486ab36d6.tar.gz cpython-6504c664dc6f8e8ca2869f761286418486ab36d6.tar.bz2 | |
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'
........
Diffstat (limited to 'Lib/distutils')
| -rw-r--r-- | Lib/distutils/command/build_ext.py | 2 | ||||
| -rw-r--r-- | Lib/distutils/tests/test_build_ext.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py index 6f90499..14c529a 100644 --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -726,7 +726,7 @@ class build_ext(Command): """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 "init" function. + the .pyd file (DLL) must export the module "PyInit_" function. """ initfunc_name = "PyInit_" + ext.name.split('.')[-1] if initfunc_name not in ext.export_symbols: diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py index d97a97e..7a27f34 100644 --- a/Lib/distutils/tests/test_build_ext.py +++ b/Lib/distutils/tests/test_build_ext.py @@ -299,7 +299,7 @@ class BuildExtTestCase(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]}) |