BIND 10 trac2908, updated. 926a9b1b81f91338aa03abcbed25b962ca86d209 [2908] align comments in PyTypeObject
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Jun 12 02:31:02 UTC 2013
The branch, trac2908 has been updated
via 926a9b1b81f91338aa03abcbed25b962ca86d209 (commit)
via 27dcf35fa3b3d65a031df6c434343db2d5ddb8f8 (commit)
from 827f143ed26198b3726d0921590f8e91fae11b4c (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 926a9b1b81f91338aa03abcbed25b962ca86d209
Author: Paul Selkirk <pselkirk at isc.org>
Date: Tue Jun 11 17:07:00 2013 -0400
[2908] align comments in PyTypeObject
commit 27dcf35fa3b3d65a031df6c434343db2d5ddb8f8
Author: Paul Selkirk <pselkirk at isc.org>
Date: Tue Jun 11 17:05:27 2013 -0400
[2908] iterate directly on ZoneTableAccessor
-----------------------------------------------------------------------
Summary of changes:
.../python/isc/datasrc/tests/clientlist_test.py | 14 +++++---------
.../isc/datasrc/zonetable_accessor_python.cc | 18 ++++++------------
.../isc/datasrc/zonetable_iterator_python.cc | 2 +-
3 files changed, 12 insertions(+), 22 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/python/isc/datasrc/tests/clientlist_test.py b/src/lib/python/isc/datasrc/tests/clientlist_test.py
index e90422e..2609b6b 100644
--- a/src/lib/python/isc/datasrc/tests/clientlist_test.py
+++ b/src/lib/python/isc/datasrc/tests/clientlist_test.py
@@ -173,7 +173,7 @@ class ClientListTest(unittest.TestCase):
# first datasrc - empty zone table
table = self.clist.get_zone_table_accessor(None, True)
self.assertIsNotNone(table)
- iterator = table.get_iterator()
+ iterator = iter(table)
self.assertIsNotNone(iterator)
self.assertEqual(0, len(list(iterator)))
@@ -194,16 +194,13 @@ class ClientListTest(unittest.TestCase):
# first datasrc
table = self.clist.get_zone_table_accessor(None, True)
self.assertIsNotNone(table)
- iterator = table.get_iterator()
- self.assertIsNotNone(iterator)
- zonelist = list(iterator)
+ zonelist = list(table)
self.assertEqual(1, len(zonelist))
self.assertEqual(zonelist[0][1], isc.dns.Name("example.org"))
# named datasrc
table = self.clist.get_zone_table_accessor("MasterFiles", True)
- iterator = table.get_iterator()
- self.assertEqual(zonelist, list(iterator))
+ self.assertEqual(zonelist, list(table))
# longer zone list for non-trivial iteration
self.clist.configure('''[{
@@ -217,8 +214,7 @@ class ClientListTest(unittest.TestCase):
},
"cache-enable": true
}]''', True)
- zonelist = list(self.clist.get_zone_table_accessor(None, True).
- get_iterator())
+ zonelist = list(self.clist.get_zone_table_accessor(None, True))
self.assertEqual(5, len(zonelist))
self.assertTrue((0, isc.dns.Name("example.net.")) in zonelist)
@@ -230,7 +226,7 @@ class ClientListTest(unittest.TestCase):
isc.dns.Name("example.biz"),
isc.dns.Name("example.edu")]
table = self.clist.get_zone_table_accessor("MasterFiles", True)
- for index, zone in table.get_iterator():
+ for index, zone in table:
self.assertTrue(zone in zonelist)
zonelist.remove(zone)
self.assertEqual(0, len(zonelist))
diff --git a/src/lib/python/isc/datasrc/zonetable_accessor_python.cc b/src/lib/python/isc/datasrc/zonetable_accessor_python.cc
index 2919a0f..353f7b5 100644
--- a/src/lib/python/isc/datasrc/zonetable_accessor_python.cc
+++ b/src/lib/python/isc/datasrc/zonetable_accessor_python.cc
@@ -67,7 +67,7 @@ ZoneTableAccessor_destroy(PyObject* po_self) {
}
PyObject*
-ZoneTableAccessor_getIterator(PyObject* po_self, PyObject* args) {
+ZoneTableAccessor_iter(PyObject* po_self) {
s_ZoneTableAccessor* const self =
static_cast<s_ZoneTableAccessor*>(po_self);
try {
@@ -90,12 +90,6 @@ ZoneTableAccessor_getIterator(PyObject* po_self, PyObject* args) {
// 3. Argument type
// 4. Documentation
PyMethodDef ZoneTableAccessor_methods[] = {
- { "get_iterator",
- ZoneTableAccessor_getIterator, METH_NOARGS,
-"get_iterator() -> isc.datasrc.ZoneTableIterator\n\
-\n\
-Return a zone table iterator.\n\
-\n" },
{ NULL, NULL, 0, NULL }
};
@@ -116,9 +110,9 @@ namespace python {
PyTypeObject zonetableaccessor_type = {
PyVarObject_HEAD_INIT(NULL, 0)
"datasrc.ZoneTableAccessor",
- sizeof(s_ZoneTableAccessor), // tp_basicsize
+ sizeof(s_ZoneTableAccessor), // tp_basicsize
0, // tp_itemsize
- ZoneTableAccessor_destroy, // tp_dealloc
+ ZoneTableAccessor_destroy, // tp_dealloc
NULL, // tp_print
NULL, // tp_getattr
NULL, // tp_setattr
@@ -134,14 +128,14 @@ PyTypeObject zonetableaccessor_type = {
NULL, // tp_setattro
NULL, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
- ZoneTableAccessor_doc,
+ ZoneTableAccessor_doc, // tp_doc
NULL, // tp_traverse
NULL, // tp_clear
NULL, // tp_richcompare
0, // tp_weaklistoffset
- NULL, // tp_iter
+ ZoneTableAccessor_iter, // tp_iter
NULL, // tp_iternext
- ZoneTableAccessor_methods, // tp_methods
+ ZoneTableAccessor_methods, // tp_methods
NULL, // tp_members
NULL, // tp_getset
NULL, // tp_base
diff --git a/src/lib/python/isc/datasrc/zonetable_iterator_python.cc b/src/lib/python/isc/datasrc/zonetable_iterator_python.cc
index eeb0c27..9ac7cd9 100644
--- a/src/lib/python/isc/datasrc/zonetable_iterator_python.cc
+++ b/src/lib/python/isc/datasrc/zonetable_iterator_python.cc
@@ -146,7 +146,7 @@ PyTypeObject zonetableiterator_type = {
NULL, // tp_setattro
NULL, // tp_as_buffer
Py_TPFLAGS_DEFAULT, // tp_flags
- ZoneTableIterator_doc,
+ ZoneTableIterator_doc, // tp_doc
NULL, // tp_traverse
NULL, // tp_clear
NULL, // tp_richcompare
More information about the bind10-changes
mailing list