[Python-checkins] cpython (merge 3.3 -> default): Issue #17736: fix misleading comment in _elementtree.c

Mon Apr 22 14:29:33 CEST 2013

http://hg.python.org/cpython/rev/3bfe8327612a
changeset: 83493:3bfe8327612a
parent: 83491:9c0a677dbbc0
parent: 83492:041960bf92fe
user: Eli Bendersky <eliben at gmail.com>
date: Mon Apr 22 05:29:09 2013 -0700
summary:
 Issue #17736: fix misleading comment in _elementtree.c
Patch by Jonas Wagner
files:
 Misc/ACKS | 1 +
 Modules/_elementtree.c | 4 +++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1301,6 +1301,7 @@
 Ke Wang
 Greg Ward
 Zachary Ware
+Jonas Wagner
 Barry Warsaw
 Steve Waterbury
 Bob Watson
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -271,7 +271,9 @@
 * This is required by some constructors/functions in this module that can
 * either accept attrib as a keyword argument or all attributes splashed
 * directly into *kwds.
- * If there is no 'attrib' keyword, return an empty dict.
+ *
+ * Return a dictionary with the content of kwds merged into the content of
+ * attrib. If there is no attrib keyword, return a copy of kwds.
 */
 static PyObject*
 get_attrib_from_keywords(PyObject *kwds)
-- 
Repository URL: http://hg.python.org/cpython
