[svn] commit: r3348 - /branches/trac375/src/lib/datasrc/python/pydatasrc.cc

BIND 10 source code commits bind10-changes at lists.isc.org
Mon Oct 25 12:13:28 UTC 2010


Author: jelte
Date: Mon Oct 25 12:13:28 2010
New Revision: 3348

Log:
removed a catch that was too wide

Modified:
    branches/trac375/src/lib/datasrc/python/pydatasrc.cc

Modified: branches/trac375/src/lib/datasrc/python/pydatasrc.cc
==============================================================================
--- branches/trac375/src/lib/datasrc/python/pydatasrc.cc (original)
+++ branches/trac375/src/lib/datasrc/python/pydatasrc.cc Mon Oct 25 12:13:28 2010
@@ -430,6 +430,7 @@
 
 /*
  * conversion helper functions
+ * Warning: these functions assume the type has been checked.
  */
 isc::dns::Name
 PyName_AsName(PyObject* name_obj)
@@ -639,21 +640,11 @@
     PyObject* rdata_list_obj = PyObject_CallMethod(rrset_obj,
                                                    const_cast<char*>("get_rdata"),
                                                    NULL);
-    try {
-        for (int i = 0; i < PyList_Size(rdata_list_obj); ++i) {
-            isc::dns::rdata::ConstRdataPtr rdata =
-                                       PyRdata_AsRdataPtr(rrtype, rrclass,
-                                       PyList_GET_ITEM(rdata_list_obj, i));
-            rrset_ptr->addRdata(*rdata);
-        }
-    } catch (isc::Exception exc) {
-        // Should we specialize on exceptions here?
-        Py_DECREF(name_obj);
-        Py_DECREF(rrclass_obj);
-        Py_DECREF(rrtype_obj);
-        Py_DECREF(rrttl_obj);
-
-        PyErr_SetString(PyExc_Exception, exc.what());
+    for (int i = 0; i < PyList_Size(rdata_list_obj); ++i) {
+        isc::dns::rdata::ConstRdataPtr rdata =
+                                   PyRdata_AsRdataPtr(rrtype, rrclass,
+                                   PyList_GET_ITEM(rdata_list_obj, i));
+        rrset_ptr->addRdata(*rdata);
     }
 
     Py_DECREF(name_obj);




More information about the bind10-changes mailing list