BIND 10 trac2853, updated. efea64180e770421ac70e4a607e0b5587433b55a [2853] Return any error message returned by ZoneWriter::load()

[BIND 10 source code commits]

The branch, trac2853 has been updated
       via  efea64180e770421ac70e4a607e0b5587433b55a (commit)
       via  cbd8f4ddcdff128ec9f545b35151a8c64affb063 (commit)
      from  f61a5e73721ee68e4fb330f59a15fe5baf8fadb2 (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 efea64180e770421ac70e4a607e0b5587433b55a
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Jun 7 12:53:14 2013 +0530

    [2853] Return any error message returned by ZoneWriter::load()

commit cbd8f4ddcdff128ec9f545b35151a8c64affb063
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Jun 7 12:52:49 2013 +0530

    [2853] Use Py_RETURN_NONE macro instead of returning PyNone directly

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

Summary of changes:
 .../python/isc/datasrc/tests/clientlist_test.py    |    3 ++-
 src/lib/python/isc/datasrc/zonewriter_python.cc    |   12 ++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/datasrc/tests/clientlist_test.py b/src/lib/python/isc/datasrc/tests/clientlist_test.py
index 51d74b7..499e012 100644
--- a/src/lib/python/isc/datasrc/tests/clientlist_test.py
+++ b/src/lib/python/isc/datasrc/tests/clientlist_test.py
@@ -190,7 +190,8 @@ class ClientListTest(unittest.TestCase):
         result, self.__zone_writer = self.clist.get_cached_zone_writer(isc.dns.Name("example.org"))
         self.assertEqual(isc.datasrc.ConfigurableClientList.CACHE_STATUS_ZONE_SUCCESS,
                          result)
-        self.__zone_writer.load()
+        err_msg = self.__zone_writer.load()
+        self.assertIsNone(err_msg)
         self.__zone_writer.install()
         self.__zone_writer.cleanup()
 
diff --git a/src/lib/python/isc/datasrc/zonewriter_python.cc b/src/lib/python/isc/datasrc/zonewriter_python.cc
index 8efcb16..1e7df65 100644
--- a/src/lib/python/isc/datasrc/zonewriter_python.cc
+++ b/src/lib/python/isc/datasrc/zonewriter_python.cc
@@ -85,7 +85,11 @@ PyObject*
 ZoneWriter_load(PyObject* po_self, PyObject*) {
     s_ZoneWriter* self = static_cast<s_ZoneWriter*>(po_self);
     try {
-        self->cppobj->load();
+        std::string error_msg;
+        self->cppobj->load(&error_msg);
+        if (!error_msg.empty()) {
+            return (Py_BuildValue("s", error_msg.c_str()));
+        }
     } catch (const std::exception& exc) {
         PyErr_SetString(getDataSourceException("Error"), exc.what());
         return (NULL);
@@ -95,7 +99,7 @@ ZoneWriter_load(PyObject* po_self, PyObject*) {
         return (NULL);
     }
 
-    return (Py_None);
+    Py_RETURN_NONE;
 }
 
 PyObject*
@@ -112,7 +116,7 @@ ZoneWriter_install(PyObject* po_self, PyObject*) {
         return (NULL);
     }
 
-    return (Py_None);
+    Py_RETURN_NONE;
 }
 
 PyObject*
@@ -129,7 +133,7 @@ ZoneWriter_cleanup(PyObject* po_self, PyObject*) {
         return (NULL);
     }
 
-    return (Py_None);
+    Py_RETURN_NONE;
 }
 
 // This list contains the actual set of functions we have in