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

Commit 48088ee

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

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

Objects/clinic/dictobject.c.h

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,25 @@ PyDoc_STRVAR(dict_get__doc__,
5555
{"get", (PyCFunction)dict_get, METH_FASTCALL, dict_get__doc__},
5656

5757
static PyObject *
58-
dict_get_impl(PyDictObject *self, PyObject *key, PyObject *failobj);
58+
dict_get_impl(PyDictObject *self, PyObject *key, PyObject *default_value);
5959

6060
static PyObject *
6161
dict_get(PyDictObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
6262
{
6363
PyObject *return_value = NULL;
6464
PyObject *key;
65-
PyObject *failobj = Py_None;
65+
PyObject *default_value = Py_None;
6666

6767
if (!_PyArg_UnpackStack(args, nargs, "get",
6868
1, 2,
69-
&key, &failobj)) {
69+
&key, &default_value)) {
7070
goto exit;
7171
}
7272

7373
if (!_PyArg_NoStackKeywords("get", kwnames)) {
7474
goto exit;
7575
}
76-
return_value = dict_get_impl(self, key, failobj);
76+
return_value = dict_get_impl(self, key, default_value);
7777

7878
exit:
7979
return return_value;
@@ -89,27 +89,28 @@ PyDoc_STRVAR(dict_setdefault__doc__,
8989
{"setdefault", (PyCFunction)dict_setdefault, METH_FASTCALL, dict_setdefault__doc__},
9090

9191
static PyObject *
92-
dict_setdefault_impl(PyDictObject *self, PyObject *key, PyObject *defaultobj);
92+
dict_setdefault_impl(PyDictObject *self, PyObject *key,
93+
PyObject *default_value);
9394

9495
static PyObject *
9596
dict_setdefault(PyDictObject *self, PyObject **args, Py_ssize_t nargs, PyObject *kwnames)
9697
{
9798
PyObject *return_value = NULL;
9899
PyObject *key;
99-
PyObject *defaultobj = Py_None;
100+
PyObject *default_value = Py_None;
100101

101102
if (!_PyArg_UnpackStack(args, nargs, "setdefault",
102103
1, 2,
103-
&key, &defaultobj)) {
104+
&key, &default_value)) {
104105
goto exit;
105106
}
106107

107108
if (!_PyArg_NoStackKeywords("setdefault", kwnames)) {
108109
goto exit;
109110
}
110-
return_value = dict_setdefault_impl(self, key, defaultobj);
111+
return_value = dict_setdefault_impl(self, key, default_value);
111112

112113
exit:
113114
return return_value;
114115
}
115-
/*[clinic end generated code: output=1b0cea84b4b6989e input=a9049054013a1b77]*/
116+
/*[clinic end generated code: output=6e9d917602373072 input=a9049054013a1b77]*/

Objects/dictobject.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2794,15 +2794,15 @@ dict___contains__(PyDictObject *self, PyObject *key)
27942794
dict.get
27952795
27962796
key: object
2797-
default as failobj: object = None
2797+
default: object = None
27982798
/
27992799
28002800
D.get(key[, default]) -> D[key] if key in D, else default.
28012801
[clinic start generated code]*/
28022802

28032803
static PyObject *
2804-
dict_get_impl(PyDictObject *self, PyObject *key, PyObject *failobj)
2805-
/*[clinic end generated code: output=c4a84a7ddbca9b7b input=7c976a78f258e915]*/
2804+
dict_get_impl(PyDictObject *self, PyObject *key, PyObject *default_value)
2805+
/*[clinic end generated code: output=bba707729dee05bf input=e73ab0f028f4b2be]*/
28062806
{
28072807
PyObject *val = NULL;
28082808
Py_hash_t hash;
@@ -2818,7 +2818,7 @@ dict_get_impl(PyDictObject *self, PyObject *key, PyObject *failobj)
28182818
if (ix == DKIX_ERROR)
28192819
return NULL;
28202820
if (ix == DKIX_EMPTY || val == NULL) {
2821-
val = failobj;
2821+
val = default_value;
28222822
}
28232823
Py_INCREF(val);
28242824
return val;
@@ -2912,19 +2912,20 @@ PyDict_SetDefault(PyObject *d, PyObject *key, PyObject *defaultobj)
29122912
dict.setdefault
29132913
29142914
key: object
2915-
default as defaultobj: object = None
2915+
default: object = None
29162916
/
29172917
29182918
D.get(key,default), also set D[key]=default if key not in D.
29192919
[clinic start generated code]*/
29202920

29212921
static PyObject *
2922-
dict_setdefault_impl(PyDictObject *self, PyObject *key, PyObject *defaultobj)
2923-
/*[clinic end generated code: output=692f85384b0b292e input=178f0c81d496d5cd]*/
2922+
dict_setdefault_impl(PyDictObject *self, PyObject *key,
2923+
PyObject *default_value)
2924+
/*[clinic end generated code: output=f8c1101ebf69e220 input=b2826255bacd845a]*/
29242925
{
29252926
PyObject *val;
29262927

2927-
val = PyDict_SetDefault((PyObject *)self, key, defaultobj);
2928+
val = PyDict_SetDefault((PyObject *)self, key, default_value);
29282929
Py_XINCREF(val);
29292930
return val;
29302931
}

0 commit comments

Comments
 (0)