diff options
author | Eli Bendersky <eliben@gmail.com> | 2013-04-22 05:25:25 -0700 |
---|---|---|
committer | Eli Bendersky <eliben@gmail.com> | 2013-04-22 05:25:25 -0700 |
commit | 44df9d8220fe78be50691ad4da4cbd6042e8111b (patch) | |
tree | 7b953344f9c7f1b427e6f39d51bf04301fa29861 | |
parent | fcc1ad1476fa2633883384baa2ecabf2f5d27360 (diff) | |
download | cpython-44df9d8220fe78be50691ad4da4cbd6042e8111b.tar.gz |
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 49441cc827..86fdd2f1db 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) |