From d4cb4b74517922a4594b252edadb35222e81e47d Mon Sep 17 00:00:00 2001 From: Eli Bendersky Date: Mon, 22 Apr 2013 05:25:25 -0700 Subject: Issue #17736: fix misleading comment in _elementtree.c Patch by Jonas Wagner --- Misc/ACKS | 1 + Modules/_elementtree.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) 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) -- cgit v0.12