commit 7b31b1a2a405ac7273e90a4110c0b7c79acbeb53
author Eli Bendersky <eliben@gmail.com> Sat Jul 21 20:32:39 2012 +0300
committer Eli Bendersky <eliben@gmail.com> Sat Jul 21 20:32:39 2012 +0300
tree 7c24b2506737a823e7ffdf8cae64f29d8411223f
parent 2731c049ac836aef0c57129eef2e23114f6d040c
parent ef391ac982400f3917037bfaa3a590dc3d61eeb4

Raise ImportError if pyexpat's version is incompatible

Modules/_elementtree.c

diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index a7201a5..6f17d80 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -3511,11 +3511,13 @@
             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