diff options
author | Eli Bendersky <eliben@gmail.com> | 2013-11-24 14:55:04 (GMT) |
---|---|---|
committer | Eli Bendersky <eliben@gmail.com> | 2013-11-24 14:55:04 (GMT) |
commit | 163d7f02a1091eb7386ffeb4de6c7aa282254181 (patch) | |
tree | a5c4609c9c6361ec35007e397a2e48d201827daa | |
parent | f4b8e60ae3220ed8fe4426286396b4ea43654523 (diff) | |
download | cpython-163d7f02a1091eb7386ffeb4de6c7aa282254181.zip cpython-163d7f02a1091eb7386ffeb4de6c7aa282254181.tar.gz cpython-163d7f02a1091eb7386ffeb4de6c7aa282254181.tar.bz2 |
Cosmetic fixes
-rw-r--r-- | Modules/_elementtree.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index 797e357..46a1f41 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -567,8 +567,9 @@ subelement(PyObject *self, PyObject *args, PyObject *kwds) PyObject* attrib = NULL; if (!PyArg_ParseTuple(args, "O!O|O!:SubElement", &Element_Type, &parent, &tag, - &PyDict_Type, &attrib)) + &PyDict_Type, &attrib)) { return NULL; + } if (attrib) { /* attrib passed as positional arg */ @@ -652,7 +653,6 @@ element_dealloc(ElementObject* self) } /* -------------------------------------------------------------------- */ -/* methods (in alphabetical order) */ static PyObject* element_append(ElementObject* self, PyObject* args) @@ -696,8 +696,7 @@ element_copy(ElementObject* self, PyObject* args) return NULL; 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) return NULL; @@ -710,7 +709,6 @@ element_copy(ElementObject* self, PyObject* args) Py_INCREF(JOIN_OBJ(element->tail)); if (self->extra) { - if (element_resize(element, self->extra->length) < 0) { Py_DECREF(element); return NULL; @@ -722,7 +720,6 @@ element_copy(ElementObject* self, PyObject* args) } element->extra->length = self->extra->length; - } return (PyObject*) element; @@ -779,7 +776,6 @@ element_deepcopy(ElementObject* self, PyObject* args) element->tail = JOIN_SET(tail, JOIN_GET(self->tail)); if (self->extra) { - if (element_resize(element, self->extra->length) < 0) goto error; @@ -793,7 +789,6 @@ element_deepcopy(ElementObject* self, PyObject* args) } element->extra->length = self->extra->length; - } /* 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++) { 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); if (text == Py_None) return PyUnicode_New(0, 0); @@ -1207,12 +1202,12 @@ element_iterfind(ElementObject *self, PyObject *args, PyObject *kwds) elementtreestate *st = ET_STATE_GLOBAL; if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:iterfind", kwlist, - &tag, &namespaces)) + &tag, &namespaces)) { return NULL; + } return _PyObject_CallMethodId( - st->elementpath_obj, &PyId_iterfind, "OOO", self, tag, namespaces - ); + st->elementpath_obj, &PyId_iterfind, "OOO", self, tag, namespaces); } static PyObject* |