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 6f9049922926fb280a6dafd65e79814f8daeb1c1..14c529ac5b35c65a961fcc05fd22b28e7c3df8e5 100644 (file)
--- 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 d97a97eba07c5dac17b1f013d459e33459faf692..7a27f343a73bed6292c529204fc1a1165c1fd469 100644 (file)
--- 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]})

diff --git a/Misc/NEWS b/Misc/NEWS
index d0f155a9e0a2423a8466a7f965228a8f711fdc0a..190c8a5178a2b47e4e1967c425487fd57ac21888 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -888,6 +888,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 #6377: Enabled the compiler option, and deprecate its usage as an