[Python-checkins] cpython (merge 3.2 -> default): Merge for #14988

[eli.bendersky]

http://hg.python.org/cpython/rev/c8774ff45733
changeset:   78154:c8774ff45733
parent:      78151:d087ef80372d
parent:      78153:9c6e726801cf
user:        Eli Bendersky <eliben at gmail.com>
date:        Tue Jul 17 14:25:14 2012 +0300
summary:
  Merge for #14988

files:
  Modules/_elementtree.c |  6 +-----
  1 files changed, 1 insertions(+), 5 deletions(-)


diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -3514,12 +3514,8 @@
             expat_capi = NULL;
         }
     }
-    if (!expat_capi) {
-        PyErr_SetString(
-            PyExc_RuntimeError, "cannot load dispatch table from pyexpat"
-            );
+    if (!expat_capi)
         return NULL;
-    }
 
     elementtree_parseerror_obj = PyErr_NewException(
         "xml.etree.ElementTree.ParseError", PyExc_SyntaxError, NULL

-- 
Repository URL: http://hg.python.org/cpython