mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 10:45:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

The get() and iter() are now able to accept keyword arguments.

Browse source 
In conformance with the documentation and the Python version.
Patch by Franck Michea.
This commit is contained in:
Eli Bendersky 2013-01-05 06:26:39 -08:00
parent 9f6a239cf1
commit a873690d2c
3 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Modules/_elementtree.c
View file

@ -1031,13 +1031,16 @@ element_iterfind(ElementObject *self, PyObject *args, PyObject *kwds)
}
static PyObject*
element_get(ElementObject* self, PyObject* args)
element_get(ElementObject* self, PyObject* args, PyObject* kwds)
{
PyObject* value;
static char* kwlist[] = {"key", "default", 0};
PyObject* key;
PyObject* default_value = Py_None;
if (!PyArg_ParseTuple(args, "O|O:get", &key, &default_value))
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:get", kwlist, &key,
&default_value))
return NULL;
if (!self->extra || self->extra->attrib == Py_None)
@ -1085,10 +1088,12 @@ create_elementiter(ElementObject *self, PyObject *tag, int gettext);
static PyObject *
element_iter(ElementObject *self, PyObject *args)
element_iter(ElementObject *self, PyObject *args, PyObject *kwds)
{
PyObject* tag = Py_None;
if (!PyArg_ParseTuple(args, "|O:iter", &tag))
static char* kwlist[] = {"tag", 0};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O:iter", kwlist, &tag))
return NULL;
return create_elementiter(self, tag, 0);
@ -1555,7 +1560,7 @@ static PyMethodDef element_methods[] = {
{"clear", (PyCFunction) element_clearmethod, METH_VARARGS},
{"get", (PyCFunction) element_get, METH_VARARGS},
{"get", (PyCFunction) element_get, METH_VARARGS | METH_KEYWORDS},
{"set", (PyCFunction) element_set, METH_VARARGS},
{"find", (PyCFunction) element_find, METH_VARARGS | METH_KEYWORDS},
@ -1567,11 +1572,11 @@ static PyMethodDef element_methods[] = {
{"insert", (PyCFunction) element_insert, METH_VARARGS},
{"remove", (PyCFunction) element_remove, METH_VARARGS},
{"iter", (PyCFunction) element_iter, METH_VARARGS},
{"iter", (PyCFunction) element_iter, METH_VARARGS | METH_KEYWORDS},
{"itertext", (PyCFunction) element_itertext, METH_VARARGS},
{"iterfind", (PyCFunction) element_iterfind, METH_VARARGS | METH_KEYWORDS},
{"getiterator", (PyCFunction) element_iter, METH_VARARGS},
{"getiterator", (PyCFunction) element_iter, METH_VARARGS | METH_KEYWORDS},
{"getchildren", (PyCFunction) element_getchildren, METH_VARARGS},
{"items", (PyCFunction) element_items, METH_VARARGS},
@ -3461,7 +3466,7 @@ static PyTypeObject XMLParser_Type = {
/* python module interface */
static PyMethodDef _functions[] = {
{"SubElement", (PyCFunction) subelement, METH_VARARGS|METH_KEYWORDS},
{"SubElement", (PyCFunction) subelement, METH_VARARGS | METH_KEYWORDS},
{NULL, NULL}
};