diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2016-09-29 22:14:02 +0200 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2016-09-29 22:14:02 +0200 |
| commit | 701fb4ba9a31e6ffd354e596dfbe6ca88727de9f (patch) | |
| tree | d6a3a0314b89bbd190b35df9d8710449cecca8ff | |
| parent | e9e44484a51d4caab2a28c883dccb7321828abde (diff) | |
| parent | 84d8baadbed31968b83a2a0f4ee4f770bbb32c7a (diff) | |
| download | cpython-git-701fb4ba9a31e6ffd354e596dfbe6ca88727de9f.tar.gz | |
Merge 3.6
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_elementtree.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -52,6 +52,9 @@ Core and Builtins Library ------- +- Issue #28314: Fix function declaration (C flags) for the getiterator() method + of xml.etree.ElementTree.Element. + - Issue #28148: Stop using localtime() and gmtime() in the time module. diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c index dd8417a1ac..3362195ed6 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -3702,7 +3702,7 @@ static PyMethodDef element_methods[] = { _ELEMENTTREE_ELEMENT_ITERTEXT_METHODDEF _ELEMENTTREE_ELEMENT_ITERFIND_METHODDEF - {"getiterator", (PyCFunction)_elementtree_Element_iter, METH_VARARGS|METH_KEYWORDS, _elementtree_Element_iter__doc__}, + {"getiterator", (PyCFunction)_elementtree_Element_iter, METH_FASTCALL, _elementtree_Element_iter__doc__}, _ELEMENTTREE_ELEMENT_GETCHILDREN_METHODDEF _ELEMENTTREE_ELEMENT_ITEMS_METHODDEF |