]> granicus.if.org Git - python/commitdiff
Merge for #14988
authorEli Bendersky <eliben@gmail.com>
Tue, 17 Jul 2012 11:25:14 +0000 (14:25 +0300)
committerEli Bendersky <eliben@gmail.com>
Tue, 17 Jul 2012 11:25:14 +0000 (14:25 +0300)
1  2 
Modules/_elementtree.c

index 6415797f5690a6e7e384b98e2783c2335e7aa079,d734c2637a95604863f6ff0cb78f021b5b11701e..a7201a5fcf0dcc195b94180da85b4cae35b459a1
@@@ -3510,19 -3114,15 +3510,15 @@@ 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;
 +        }
      }
-     if (!expat_capi) {
-         PyErr_SetString(
-             PyExc_RuntimeError, "cannot load dispatch table from pyexpat"
-             );
+     if (!expat_capi)
          return NULL;
-     }
 -#endif
  
      elementtree_parseerror_obj = PyErr_NewException(
 -        "cElementTree.ParseError", PyExc_SyntaxError, NULL
 +        "xml.etree.ElementTree.ParseError", PyExc_SyntaxError, NULL
          );
      Py_INCREF(elementtree_parseerror_obj);
      PyModule_AddObject(m, "ParseError", elementtree_parseerror_obj);