diff options
| author | Eli Bendersky <eliben@gmail.com> | 2013-04-22 12:29:09 (GMT) |
|---|---|---|
| committer | Eli Bendersky <eliben@gmail.com> | 2013-04-22 12:29:09 (GMT) |
| commit | ed8b86d323f83d546574fc7b4a6dd22579319f70 (patch) | |
| tree | c6b57afbee9dd042d937a493ee32267fa0759b96 | |
| parent | 40589f4b6307ddfa840cdca1d2446415b813a796 (diff) | |
| parent | d4cb4b74517922a4594b252edadb35222e81e47d (diff) | |
| download | cpython-ed8b86d323f83d546574fc7b4a6dd22579319f70.zip cpython-ed8b86d323f83d546574fc7b4a6dd22579319f70.tar.gz cpython-ed8b86d323f83d546574fc7b4a6dd22579319f70.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
@@ -1301,6 +1301,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 c87b6a2..b05a39f 100644 --- a/Modules/_elementtree.c +++ b/Modules/_elementtree.c @@ -271,7 +271,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) |