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

[eli.bendersky]

http://hg.python.org/cpython/rev/041960bf92fe
changeset:   83492:041960bf92fe
branch:      3.3
parent:      83490:d03784713786
user:        Eli Bendersky <eliben at gmail.com>
date:        Mon Apr 22 05:25:25 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
@@ -1274,6 +1274,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
@@ -312,7 +312,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