Raise ImportError if pyexpat's version is incompatible

ef391ac9 · Eli Bendersky · 6e571d69 · ef391ac9
Commit ef391ac9 authored Jul 21, 2012 by Eli Bendersky
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

Modules/_elementtree.c Modules/_elementtree.c +7 -4

No files found.
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -3114,11 +3114,14 @@ PyInit__elementtree(void)
            expat_capi->size < sizeof(struct PyExpat_CAPI) ||
            expat_capi->MAJOR_VERSION != XML_MAJOR_VERSION ||
            expat_capi->MINOR_VERSION != XML_MINOR_VERSION ||
-            expat_capi->MICRO_VERSION != XML_MICRO_VERSION)
+            expat_capi->MICRO_VERSION != XML_MICRO_VERSION) {
-            expat_capi = NULL;
+            PyErr_SetString(PyExc_ImportError,
+                            "pyexpat version is incompatible");
+            return NULL;
        }
-    if (!expat_capi)
+    } else {
        return NULL;
+    }
 #endif
    elementtree_parseerror_obj = PyErr_NewException(