Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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)
........
This commit is contained in:
Tarek Ziadé 2009-07-11 17:22:14 +00:00
parent c42f0addef
commit bc3f3c9eed
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/distutils/command/build_ext.py
View File

@ -680,10 +680,10 @@ class build_ext (Command):
def get_export_symbols (self, ext): def get_export_symbols (self, ext):
"""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, "init" + module_name. Only relevant on Windows, where
the .pyd file (DLL) must export the module "PyInit_" function. 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: if initfunc_name not in ext.export_symbols:
ext.export_symbols.append(initfunc_name) ext.export_symbols.append(initfunc_name)
return ext.export_symbols return ext.export_symbols

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

@ -233,7 +233,7 @@ class BuildExtTestCase(support.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 PyInit_foo(void) {};\n') self.write_file(c_file, 'void init_foo(void) {};\n')
ext = Extension('foo', [c_file]) ext = Extension('foo', [c_file])
dist = Distribution({'name': 'xx', dist = Distribution({'name': 'xx',
'ext_modules': [ext]}) 'ext_modules': [ext]})

3
Misc/NEWS
View File

@ -265,9 +265,6 @@ Library
- Issue #2622: Fixed an ImportError when importing email.messsage from a - Issue #2622: Fixed an ImportError when importing email.messsage from a
standalone application built with py2exe or py2app. 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 #6455: Fixed test_build_ext under win32.
- Issue #6403: Fixed package path usage in build_ext. - Issue #6403: Fixed package path usage in build_ext.