add a warning if patching collections.abc.Generator fails

34f656d0 · Stefan Behnel · baef96df · 34f656d0
Commit 34f656d0 authored Apr 25, 2015 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 7 deletions

Cython/Utility/Generator.c Cython/Utility/Generator.c +12 -7

No files found.
--- a/Cython/Utility/Generator.c
+++ b/Cython/Utility/Generator.c
@@ -830,14 +830,19 @@ static int __Pyx_patch_abc(void) {
    static int abc_patched = 0;
    if (!abc_patched) {
        PyObject *module;
-        module = PyImport_ImportModule("collections.abc");
+        module = PyImport_ImportModule((PY_MAJOR_VERSION >= 3) ? "collections.abc" : "collections");
        if (!module) {
-            PyErr_Clear();
+            PyErr_WriteUnraisable(NULL);
-            module = PyImport_ImportModule("collections");
+            if (unlikely(PyErr_WarnEx(PyExc_RuntimeWarning, "Cython module failed to patch "
-            if (!module)
+                    #if PY_MAJOR_VERSION >= 3
-                PyErr_Clear();
+                    "collections.abc.Generator"
-        }
+                    #else
-        if (module) {
+                    "collections.Generator"
+                    #endif
+                    , 1) < 0)) {
+                return -1;
+            }
+        } else {
            PyObject *abc = PyObject_GetAttrString(module, "Generator");
            if (abc) {
                abc_patched = 1;