summaryrefslogtreecommitdiffstats
path: root/Objects/odictobject.c
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2017-01-19 17:38:13 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2017-01-19 17:38:13 (GMT)
commita70eaf21e3f0922efc4217694d2009b0b00d62e9 (patch)
treeeea3d8aba8ce9a622af5e2f9cb2502ad30ef8da7 /Objects/odictobject.c
parent48088ee9bae9bd7ceff491cb0bc82e4394c7ec23 (diff)
downloadcpython-a70eaf21e3f0922efc4217694d2009b0b00d62e9.zip
cpython-a70eaf21e3f0922efc4217694d2009b0b00d62e9.tar.gz
cpython-a70eaf21e3f0922efc4217694d2009b0b00d62e9.tar.bz2
Issue #29289: Argument Clinic generates reasonable name for the parameter "default".
Diffstat (limited to 'Objects/odictobject.c')
-rw-r--r--Objects/odictobject.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/Objects/odictobject.c b/Objects/odictobject.c
index aac454c..8b1e114 100644
--- a/Objects/odictobject.c
+++ b/Objects/odictobject.c
@@ -1012,15 +1012,15 @@ Done:
OrderedDict.setdefault
key: object
- default as failobj: object = None
+ default: object = None
od.get(k,d), also set od[k]=d if k not in od.
[clinic start generated code]*/
static PyObject *
OrderedDict_setdefault_impl(PyODictObject *self, PyObject *key,
- PyObject *failobj)
-/*[clinic end generated code: output=605d0f6f61ccb0a6 input=4ee5006f32f5691b]*/
+ PyObject *default_value)
+/*[clinic end generated code: output=97537cb7c28464b6 input=d5e940fcea7a5a67]*/
{
PyObject *result = NULL;
@@ -1030,9 +1030,9 @@ OrderedDict_setdefault_impl(PyODictObject *self, PyObject *key,
if (PyErr_Occurred())
return NULL;
assert(_odict_find_node(self, key) == NULL);
- if (PyODict_SetItem((PyObject *)self, key, failobj) >= 0) {
- result = failobj;
- Py_INCREF(failobj);
+ if (PyODict_SetItem((PyObject *)self, key, default_value) >= 0) {
+ result = default_value;
+ Py_INCREF(result);
}
}
else {
@@ -1047,9 +1047,9 @@ OrderedDict_setdefault_impl(PyODictObject *self, PyObject *key,
else if (exists) {
result = PyObject_GetItem((PyObject *)self, key);
}
- else if (PyObject_SetItem((PyObject *)self, key, failobj) >= 0) {
- result = failobj;
- Py_INCREF(failobj);
+ else if (PyObject_SetItem((PyObject *)self, key, default_value) >= 0) {
+ result = default_value;
+ Py_INCREF(result);
}
}