From: JINMEI Tatuya <jinmei@isc.org>
Date: Tue, 17 Jul 2012 20:23:15 +0000 (-0700)
Subject: [trac2116/master] don't set pyerr string in Name.split() on success.
X-Git-Tag: trac2351_base~183
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=412e1fc061aa852fad8053bf04d8cf0ce878e42d;p=thirdparty%2Fkea.git

[trac2116/master] don't set pyerr string in Name.split() on success.
---

diff --git a/src/lib/dns/python/name_python.cc b/src/lib/dns/python/name_python.cc
index 277595a49f..2799db9fde 100644
--- a/src/lib/dns/python/name_python.cc
+++ b/src/lib/dns/python/name_python.cc
@@ -386,7 +386,7 @@ Name_split(s_Name* self, PyObject* args) {
             ret->cppobj = NULL;
             try {
                 ret->cppobj = new Name(self->cppobj->split(first, n));
-            } catch(const isc::OutOfRange& oor) {
+            } catch (const isc::OutOfRange& oor) {
                 PyErr_SetString(PyExc_IndexError, oor.what());
                 ret->cppobj = NULL;
             }
@@ -408,7 +408,7 @@ Name_split(s_Name* self, PyObject* args) {
             ret->cppobj = NULL;
             try {
                 ret->cppobj = new Name(self->cppobj->split(n));
-            } catch(const isc::OutOfRange& oor) {
+            } catch (const isc::OutOfRange& oor) {
                 PyErr_SetString(PyExc_IndexError, oor.what());
                 ret->cppobj = NULL;
             }
@@ -417,11 +417,10 @@ Name_split(s_Name* self, PyObject* args) {
                 return (NULL);
             }
         }
+    } else {
+        PyErr_Clear();
+        PyErr_SetString(PyExc_TypeError, "No valid type in split argument");
     }
-
-    PyErr_Clear();
-    PyErr_SetString(PyExc_TypeError,
-                    "No valid type in split argument");
     return (ret);
 }