diff options
| author | Larry Hastings <larry@hastings.org> | 2016-06-13 03:26:28 (GMT) |
|---|---|---|
| committer | Larry Hastings <larry@hastings.org> | 2016-06-13 03:26:28 (GMT) |
| commit | 29f963732166260420ffbdebe9eb8b98a009dc8c (patch) | |
| tree | 17ad6530ee3b66b53647ab70bac08145dcd69783 /Modules/_elementtree.c | |
| parent | 6e9a96be9e24265638df8aa600e566b306a23a2b (diff) | |
| parent | 1003b34c71d53ccb88ae2768aaba503ae6b5bc16 (diff) | |
| download | cpython-29f963732166260420ffbdebe9eb8b98a009dc8c.zip cpython-29f963732166260420ffbdebe9eb8b98a009dc8c.tar.gz cpython-29f963732166260420ffbdebe9eb8b98a009dc8c.tar.bz2 | |
Merge 3.5.2rc1 with current 3.5 branch.
Diffstat (limited to 'Modules/_elementtree.c')
| -rw-r--r-- | Modules/_elementtree.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index 0f1d6a1..85ffca2 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -1582,10 +1582,23 @@ _elementtree_Element_remove_impl(ElementObject *self, PyObject *subelement) static PyObject* element_repr(ElementObject* self) { - if (self->tag) - return PyUnicode_FromFormat("<Element %R at %p>", self->tag, self); - else + int status; + + if (self->tag == NULL) return PyUnicode_FromFormat("<Element at %p>", self); + + status = Py_ReprEnter((PyObject *)self); + if (status == 0) { + PyObject *res; + res = PyUnicode_FromFormat("<Element %R at %p>", self->tag, self); + Py_ReprLeave((PyObject *)self); + return res; + } + if (status > 0) + PyErr_Format(PyExc_RuntimeError, + "reentrant call inside %s.__repr__", + Py_TYPE(self)->tp_name); + return NULL; } /*[clinic input] |