Skip to content
This repository was archived by the owner on Feb 13, 2025. It is now read-only.

Commit a70eaf2

Browse files
Issue python#29289: Argument Clinic generates reasonable name for the parameter "default".
1 parent 48088ee commit a70eaf2

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

Objects/clinic/odictobject.c.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ PyDoc_STRVAR(OrderedDict_setdefault__doc__,
4646

4747
static PyObject *
4848
OrderedDict_setdefault_impl(PyODictObject *self, PyObject *key,
49-
PyObject *failobj);
49+
PyObject *default_value);
5050

5151
static PyObject *
5252
OrderedDict_setdefault(PyODictObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
@@ -55,13 +55,13 @@ OrderedDict_setdefault(PyODictObject *self, PyObject **args, Py_ssize_t nargs, P
5555
static const char * const _keywords[] = {"key", "default", NULL};
5656
static _PyArg_Parser _parser = {"O|O:setdefault", _keywords, 0};
5757
PyObject *key;
58-
PyObject *failobj = Py_None;
58+
PyObject *default_value = Py_None;
5959

6060
if (!_PyArg_ParseStackAndKeywords(args, nargs, kwnames, &_parser,
61-
&key, &failobj)) {
61+
&key, &default_value)) {
6262
goto exit;
6363
}
64-
return_value = OrderedDict_setdefault_impl(self, key, failobj);
64+
return_value = OrderedDict_setdefault_impl(self, key, default_value);
6565

6666
exit:
6767
return return_value;
@@ -132,4 +132,4 @@ OrderedDict_move_to_end(PyODictObject *self, PyObject **args, Py_ssize_t nargs,
132132
exit:
133133
return return_value;
134134
}
135-
/*[clinic end generated code: output=f2641e1277045b59 input=a9049054013a1b77]*/
135+
/*[clinic end generated code: output=84ef19e7b5db0086 input=a9049054013a1b77]*/

Objects/odictobject.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,15 +1012,15 @@ odict_reduce(register PyODictObject *od)
10121012
OrderedDict.setdefault
10131013
10141014
key: object
1015-
default as failobj: object = None
1015+
default: object = None
10161016
10171017
od.get(k,d), also set od[k]=d if k not in od.
10181018
[clinic start generated code]*/
10191019

10201020
static PyObject *
10211021
OrderedDict_setdefault_impl(PyODictObject *self, PyObject *key,
1022-
PyObject *failobj)
1023-
/*[clinic end generated code: output=605d0f6f61ccb0a6 input=4ee5006f32f5691b]*/
1022+
PyObject *default_value)
1023+
/*[clinic end generated code: output=97537cb7c28464b6 input=d5e940fcea7a5a67]*/
10241024
{
10251025
PyObject *result = NULL;
10261026

@@ -1030,9 +1030,9 @@ OrderedDict_setdefault_impl(PyODictObject *self, PyObject *key,
10301030
if (PyErr_Occurred())
10311031
return NULL;
10321032
assert(_odict_find_node(self, key) == NULL);
1033-
if (PyODict_SetItem((PyObject *)self, key, failobj) >= 0) {
1034-
result = failobj;
1035-
Py_INCREF(failobj);
1033+
if (PyODict_SetItem((PyObject *)self, key, default_value) >= 0) {
1034+
result = default_value;
1035+
Py_INCREF(result);
10361036
}
10371037
}
10381038
else {
@@ -1047,9 +1047,9 @@ OrderedDict_setdefault_impl(PyODictObject *self, PyObject *key,
10471047
else if (exists) {
10481048
result = PyObject_GetItem((PyObject *)self, key);
10491049
}
1050-
else if (PyObject_SetItem((PyObject *)self, key, failobj) >= 0) {
1051-
result = failobj;
1052-
Py_INCREF(failobj);
1050+
else if (PyObject_SetItem((PyObject *)self, key, default_value) >= 0) {
1051+
result = default_value;
1052+
Py_INCREF(result);
10531053
}
10541054
}
10551055

0 commit comments

Comments
 (0)