[Python-checkins] r73949 - in python/branches/release31-maint: Lib/distutils/command/build_ext.py Lib/distutils/tests/test_build_ext.py Misc/NEWS

[tarek.ziade]

Author: tarek.ziade
Date: Sat Jul 11 13:01:14 2009
New Revision: 73949

Log:
Merged revisions 73948 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r73948 | tarek.ziade | 2009-07-11 12:59:56 +0200 (Sat, 11 Jul 2009) | 9 lines
  
  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'
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/distutils/command/build_ext.py
   python/branches/release31-maint/Lib/distutils/tests/test_build_ext.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/distutils/command/build_ext.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/command/build_ext.py	(original)
+++ python/branches/release31-maint/Lib/distutils/command/build_ext.py	Sat Jul 11 13:01:14 2009
@@ -679,7 +679,7 @@
         """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:

Modified: python/branches/release31-maint/Lib/distutils/tests/test_build_ext.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/tests/test_build_ext.py	(original)
+++ python/branches/release31-maint/Lib/distutils/tests/test_build_ext.py	Sat Jul 11 13:01:14 2009
@@ -296,7 +296,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 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]})

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sat Jul 11 13:01:14 2009
@@ -869,6 +869,9 @@
 Library
 -------
 
+- 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 #6413: Fixed the log level in distutils.dist for announce.