[Python-checkins] r73954 - in python/trunk: Lib/distutils/command/build_ext.py Lib/distutils/tests/test_build_ext.py Misc/NEWS

Sat Jul 11 19:21:00 CEST 2009

Author: tarek.ziade
Date: Sat Jul 11 19:21:00 2009
New Revision: 73954
Log:
reverted changes for #6459 (doesn't apply on 2.x)
Modified:
 python/trunk/Lib/distutils/command/build_ext.py
 python/trunk/Lib/distutils/tests/test_build_ext.py
 python/trunk/Misc/NEWS
Modified: python/trunk/Lib/distutils/command/build_ext.py
==============================================================================

--- python/trunk/Lib/distutils/command/build_ext.py	(original)
+++ python/trunk/Lib/distutils/command/build_ext.py	Sat Jul 11 19:21:00 2009
@@ -732,10 +732,10 @@
 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
Modified: python/trunk/Lib/distutils/tests/test_build_ext.py
==============================================================================
--- python/trunk/Lib/distutils/tests/test_build_ext.py	(original)
+++ python/trunk/Lib/distutils/tests/test_build_ext.py	Sat Jul 11 19:21:00 2009
@@ -299,7 +299,7 @@
 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], optional=False)
 dist = Distribution({'name': 'xx',
 'ext_modules': [ext]})
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Sat Jul 11 19:21:00 2009
@@ -353,9 +353,6 @@
 - 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 #6377: Enabled the compiler option, and deprecate its usage as an 
