BIND 10 trac2051, updated. 1e8929c599622a11e38651d7d765d0e380589a6a [2051] Remove dead code

[BIND 10 source code commits]

The branch, trac2051 has been updated
       via  1e8929c599622a11e38651d7d765d0e380589a6a (commit)
       via  057c023913aa0101cb818b901be7e4eb29608d35 (commit)
      from  fd9262470a93fdef1e7563cd4f273116f709a1b9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1e8929c599622a11e38651d7d765d0e380589a6a
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Jul 19 12:54:31 2012 +0200

    [2051] Remove dead code

commit 057c023913aa0101cb818b901be7e4eb29608d35
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Jul 19 12:53:35 2012 +0200

    [2051] Better error explanation
    
    When there's a JSON error, we raise an exception with better
    explanation.

-----------------------------------------------------------------------

Summary of changes:
 .../isc/datasrc/configurableclientlist_python.cc   |   24 ++++----------------
 1 file changed, 5 insertions(+), 19 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/datasrc/configurableclientlist_python.cc b/src/lib/python/isc/datasrc/configurableclientlist_python.cc
index 0817790..5db3a5a 100644
--- a/src/lib/python/isc/datasrc/configurableclientlist_python.cc
+++ b/src/lib/python/isc/datasrc/configurableclientlist_python.cc
@@ -100,6 +100,11 @@ ConfigurableClientList_configure(PyObject* po_self, PyObject* args) {
         } else {
             return (NULL);
         }
+    } catch (const isc::data::JSONError& jse) {
+        const string ex_what(std::string("JSON parse error in data source"
+                               " configuration: ") + jse.what());
+        PyErr_SetString(getDataSourceException("Error"), ex_what.c_str());
+        return (NULL);
     } catch (const std::exception& exc) {
         PyErr_SetString(getDataSourceException("Error"), exc.what());
         return (NULL);
@@ -295,25 +300,6 @@ initModulePart_ConfigurableClientList(PyObject* mod) {
     }
     Py_INCREF(&configurableclientlist_type);
 
-#if 0
-    TODO: The return states, etc.
-    try {
-        // Constant class variables
-        installClassVariable(configurableclientlist_type, "REPLACE_ME",
-                             Py_BuildValue("REPLACE ME"));
-    } catch (const exception& ex) {
-        const string ex_what =
-            "Unexpected failure in ConfigurableClientList initialization: " +
-            string(ex.what());
-        PyErr_SetString(po_IscException, ex_what.c_str());
-        return (false);
-    } catch (...) {
-        PyErr_SetString(PyExc_SystemError,
-                        "Unexpected failure in ConfigurableClientList initialization");
-        return (false);
-    }
-#endif
-
     return (true);
 }