diff options
| author | Eli Bendersky <eliben@gmail.com> | 2013-04-22 12:25:25 (GMT) |
|---|---|---|
| committer | Eli Bendersky <eliben@gmail.com> | 2013-04-22 12:25:25 (GMT) |
| commit | d4cb4b74517922a4594b252edadb35222e81e47d (patch) | |
| tree | 271665d4da25d736d5b47fd893952311d953da3f | |
| parent | e917052e1abb6e7722ef91d29c979be13ac9a539 (diff) | |
| download | cpython-d4cb4b74517922a4594b252edadb35222e81e47d.zip cpython-d4cb4b74517922a4594b252edadb35222e81e47d.tar.gz cpython-d4cb4b74517922a4594b252edadb35222e81e47d.tar.bz2 | |
Issue #17736: fix misleading comment in _elementtree.c
Patch by Jonas Wagner
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Modules/_elementtree.c | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -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) |