backport of (merged) 1.43 and 1.44

  initregex():  this function is declared void, so the recent change to
  return NULL in an error case was itself an error.
  initregex(): Check return value of PyErr_Warn() and propagate the exception
  (if any.)

diff --git a/Modules/regexmodule.c b/Modules/regexmodule.c
index 8509f483f5434c8b05d5a07aa018b14f4879b513..c0e465aadb72efc5a6f4eaeaab182094d92faf99 100644 (file)
--- a/Modules/regexmodule.c
+++ b/Modules/regexmodule.c
@@ -660,8 +660,10 @@ initregex(void)
        m = Py_InitModule("regex", regex_global_methods);
        d = PyModule_GetDict(m);
 
-       PyErr_Warn(PyExc_DeprecationWarning,
-               "the regex module is deprecated; please use the re module");
+       if (PyErr_Warn(PyExc_DeprecationWarning,
+                      "the regex module is deprecated; "
+                      "please use the re module") < 0)
+               return;
        
        /* Initialize regex.error exception */
        v = RegexError = PyErr_NewException("regex.error", NULL, NULL);