2
0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 21:45:37 +00:00

[2437] Merge branch 'trac2438' into trac2437

This commit is contained in:
JINMEI Tatuya
2013-01-04 14:17:09 -08:00

View File

@@ -234,6 +234,7 @@ RRsetCollection_init(PyObject* po_self, PyObject* args, PyObject*) {
return (0);
} else if (PyArg_ParseTuple(args, "y*O!O!", &py_buf, &name_type,
&po_name,&rrclass_type, &po_rrclass)) {
PyErr_Clear(); // clear the error for the first ParseTuple
const char* const cp = static_cast<const char*>(py_buf.buf);
std::istringstream iss(string(cp, cp + py_buf.len));
self->cppobj =
@@ -241,6 +242,7 @@ RRsetCollection_init(PyObject* po_self, PyObject* args, PyObject*) {
PyRRClass_ToRRClass(po_rrclass));
return (0);
} else if (PyArg_ParseTuple(args, "")) {
PyErr_Clear(); // clear the error for the second ParseTuple
self->cppobj = new RRsetCollection;
return (0);
}