Raise ImportError if pyexpat's version is incompatible

7b31b1a2 · Eli Bendersky · 2731c049 · ef391ac9 · 7b31b1a2
Commit 7b31b1a2 authored Jul 21, 2012 by Eli Bendersky
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

Modules/_elementtree.c Modules/_elementtree.c +5 -3

No files found.
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -3511,11 +3511,13 @@ PyInit__elementtree(void)
            expat_capi->MAJOR_VERSION != XML_MAJOR_VERSION ||
            expat_capi->MINOR_VERSION != XML_MINOR_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;
+    }

    elementtree_parseerror_obj = PyErr_NewException(
        "xml.etree.ElementTree.ParseError", PyExc_SyntaxError, NULL