[Python-checkins] cpython (merge 3.6 -> default): Merge 3.6

Thu Sep 29 16:14:45 EDT 2016

https://hg.python.org/cpython/rev/dca6d4b31da6
changeset: 104163:dca6d4b31da6
parent: 104161:dcb39d3ba67a
parent: 104162:1e29dca5dc4c
user: Victor Stinner <victor.stinner at gmail.com>
date: Thu Sep 29 22:14:02 2016 +0200
summary:
 Merge 3.6
files:
 Misc/NEWS | 3 +++
 Modules/_elementtree.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -52,6 +52,9 @@
 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
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -3702,7 +3702,7 @@
 _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
-- 
Repository URL: https://hg.python.org/cpython
