#5735: Modules compiled with incompatible settings (--with-pydebug when python is...

should generate a link-time error.

I won't backport to 3.0, because it breaks binary compatibility

diff --git a/Include/modsupport.h b/Include/modsupport.h
index 5ed34033b9814c13a08c63c8ed41619f2df92d6e..23e8fa66a747edaa06c598b1bd223af6586ee58e 100644 (file)
--- a/Include/modsupport.h
+++ b/Include/modsupport.h
@@ -92,10 +92,10 @@ PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char
 */
 
 #ifdef Py_TRACE_REFS
- /* When we are tracing reference counts, rename PyModule_New2 so
+ /* When we are tracing reference counts, rename PyModule_Create2 so
     modules compiled with incompatible settings will generate a
     link-time error. */
- #define PyModule_New2 PyModule_Create2TraceRefs
+ #define PyModule_Create2 PyModule_Create2TraceRefs
 #endif
 
 PyAPI_FUNC(PyObject *) PyModule_Create2(struct PyModuleDef*,

diff --git a/Misc/NEWS b/Misc/NEWS
index 4058526563a6394d1ad544f21370c78d581af324..570caeaf9c7bba7e301bc02c7b552b4b074f06be 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,13 @@ Windows
 
 - Issue #6158: Package Sine-1000Hz-300ms.aif in MSI file.
 
+C-API
+-----
+
+- Issue #5735: Python compiled with --with-pydebug should throw an
+  ImportError when trying to import modules compiled without
+  --with-pydebug, and vice-versa.
+
 
 What's New in Python 3.1 release candidate 1?
 =============================================