traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cosmetic fixes

This commit is contained in:
Eli Bendersky 2013-11-24 06:55:04 -08:00
parent f4b8e60ae3
commit 163d7f02a1
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Modules/_elementtree.c
View File

@ -567,8 +567,9 @@ subelement(PyObject *self, PyObject *args, PyObject *kwds)
PyObject* attrib = NULL; PyObject* attrib = NULL;
if (!PyArg_ParseTuple(args, "O!O|O!:SubElement", if (!PyArg_ParseTuple(args, "O!O|O!:SubElement",
&Element_Type, &parent, &tag, &Element_Type, &parent, &tag,
&PyDict_Type, &attrib)) &PyDict_Type, &attrib)) {
return NULL; return NULL;
}
if (attrib) { if (attrib) {
/* attrib passed as positional arg */ /* attrib passed as positional arg */
@ -652,7 +653,6 @@ element_dealloc(ElementObject* self)
} }
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* methods (in alphabetical order) */
static PyObject* static PyObject*
element_append(ElementObject* self, PyObject* args) element_append(ElementObject* self, PyObject* args)
@ -696,8 +696,7 @@ element_copy(ElementObject* self, PyObject* args)
return NULL; return NULL;
element = (ElementObject*) create_new_element( element = (ElementObject*) create_new_element(
self->tag, (self->extra) ? self->extra->attrib : Py_None self->tag, (self->extra) ? self->extra->attrib : Py_None);
);
if (!element) if (!element)
return NULL; return NULL;
@ -710,7 +709,6 @@ element_copy(ElementObject* self, PyObject* args)
Py_INCREF(JOIN_OBJ(element->tail)); Py_INCREF(JOIN_OBJ(element->tail));
if (self->extra) { if (self->extra) {
if (element_resize(element, self->extra->length) < 0) { if (element_resize(element, self->extra->length) < 0) {
Py_DECREF(element); Py_DECREF(element);
return NULL; return NULL;
@ -722,7 +720,6 @@ element_copy(ElementObject* self, PyObject* args)
} }
element->extra->length = self->extra->length; element->extra->length = self->extra->length;
} }
return (PyObject*) element; return (PyObject*) element;
@ -779,7 +776,6 @@ element_deepcopy(ElementObject* self, PyObject* args)
element->tail = JOIN_SET(tail, JOIN_GET(self->tail)); element->tail = JOIN_SET(tail, JOIN_GET(self->tail));
if (self->extra) { if (self->extra) {
if (element_resize(element, self->extra->length) < 0) if (element_resize(element, self->extra->length) < 0)
goto error; goto error;
@ -793,7 +789,6 @@ element_deepcopy(ElementObject* self, PyObject* args)
} }
element->extra->length = self->extra->length; element->extra->length = self->extra->length;
} }
/* add object to memo dictionary (so deepcopy won't visit it again) */ /* add object to memo dictionary (so deepcopy won't visit it again) */
@ -1141,8 +1136,8 @@ element_findtext(ElementObject *self, PyObject *args, PyObject *kwds)
for (i = 0; i < self->extra->length; i++) { for (i = 0; i < self->extra->length; i++) {
ElementObject* item = (ElementObject*) self->extra->children[i]; ElementObject* item = (ElementObject*) self->extra->children[i];
if (Element_CheckExact(item) && (PyObject_RichCompareBool(item->tag, tag, Py_EQ) == 1)) { if (Element_CheckExact(item) &&
(PyObject_RichCompareBool(item->tag, tag, Py_EQ) == 1)) {
PyObject* text = element_get_text(item); PyObject* text = element_get_text(item);
if (text == Py_None) if (text == Py_None)
return PyUnicode_New(0, 0); return PyUnicode_New(0, 0);
@ -1207,12 +1202,12 @@ element_iterfind(ElementObject *self, PyObject *args, PyObject *kwds)
elementtreestate *st = ET_STATE_GLOBAL; elementtreestate *st = ET_STATE_GLOBAL;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:iterfind", kwlist, if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:iterfind", kwlist,
&tag, &namespaces)) &tag, &namespaces)) {
return NULL; return NULL;
}
return _PyObject_CallMethodId( return _PyObject_CallMethodId(
st->elementpath_obj, &PyId_iterfind, "OOO", self, tag, namespaces st->elementpath_obj, &PyId_iterfind, "OOO", self, tag, namespaces);
);
} }
static PyObject* static PyObject*