summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Misc/ACKS1
-rw-r--r--Modules/_elementtree.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index fe27994..9961aa5 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1274,6 +1274,7 @@ Rodrigo Steinmuller Wanderley
Ke Wang
Greg Ward
Zachary Ware
+Jonas Wagner
Barry Warsaw
Steve Waterbury
Bob Watson
diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
index 49441cc..86fdd2f 100644
--- a/Modules/_elementtree.c
+++ b/Modules/_elementtree.c
@@ -312,7 +312,9 @@ element_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
* 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)