svn commit: r1392056 - /subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c

[rd...@apache.org]

Author: rdonch
Date: Sun Sep 30 16:07:38 2012
New Revision: 1392056

URL: http://svn.apache.org/viewvc?rev=1392056&view=rev
Log:
* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c:
  (svn_swig_py_config_enumerator2): Always clear the Python exception
    to avoid leaving Python in an inconsistent exception state.


Modified:
    subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c

Modified: subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1392056&r1=1392055&r2=1392056&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c (original)
+++ subversion/trunk/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c Sun Sep 30 16:07:38 2012
@@ -4212,6 +4212,10 @@ svn_swig_py_config_enumerator2(const cha
                                       make_ob_pool, pool)) == NULL)
     {
       err = callback_exception_error();
+      /* If it's not a SubversionException, we still have to clear it, because
+         otherwise the SWIG wrapper will not check for it, and return a value with an
+         exception pending. */
+      PyErr_Clear();
     }
   else if (!PyBool_Check(result))
     {