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'
  ........
................

diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 30457026d4f60d1e551d6e9958cd4dd7f2b8bd65..15965864999c5a02715544f5b2da5c7f5c7e17a5 100644 (file)
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -679,7 +679,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 c671483622a12776cd0b4181778cbd1d7381ed3f..9861ee29937457d092b0805e85f4df3530f61832 100644 (file)
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -296,7 +296,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]})

diff --git a/Misc/NEWS b/Misc/NEWS
index 8ef35669e4c07fa7690390a7a790444ea96220eb..a3aebf0e526f467563d2b0c3c6fa901fca7f0f80 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -869,6 +869,9 @@ Core and Builtins
 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.