8000 Merge pull request #8861 from eric-wieser/arg-parse-name · numpy/numpy@ee8ce24 · GitHub
[go: up one dir, main page]
Skip to content

Commit ee8ce24

Browse files
juliantaylorjuliantaylor
authored
Merge pull request #8861 from eric-wieser/arg-parse-name
MAINT: Include the function name in all argument error messages
2 parents cae886e + dcafaf4 commit ee8ce24

File tree

11 files changed

+132
-123
lines changed

11 files changed

+132
-123
lines changed

‎numpy/core/src/multiarray/arrayobject.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1620,7 +1620,7 @@ array_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds)
16201620
* strides, and swapped info For now, let's just use this to create an
16211621
* empty, contiguous array of a specific type and shape.
16221622
*/
1623-
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&|O&O&LO&O&",
1623+
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&|O&O&LO&O&:ndarray",
16241624
kwlist, PyArray_IntpConverter,
16251625
&dims,
16261626
PyArray_DescrConverter,

‎numpy/core/src/multiarray/compiled_base.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ arr_bincount(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwds)
101101
double *weights , *dans;
102102
static char *kwlist[] = {"list", "weights", "minlength", NULL};
103103

104-
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|OO",
104+
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|OO:bincount",
105105
kwlist, &list, &weight, &mlength)) {
106106
goto fail;
107107
}
@@ -217,7 +217,7 @@ arr_digitize(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwds)
217217

218218
static char *kwlist[] = {"x", "bins", "right", NULL};
219219

220-
if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO|i", kwlist,
220+
if (!PyArg_ParseTupleAndKeywords(args, kwds, "OO|i:digitize", kwlist,
221221
&obj_x, &obj_bins, &right)) {
222222
goto fail;
223223
}
@@ -533,7 +533,7 @@ arr_interp(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwdict)
533533

534534
NPY_BEGIN_THREADS_DEF;
535535

536-
if (!PyArg_ParseTupleAndKeywords(args, kwdict, "OOO|OO", kwlist,
536+
if (!PyArg_ParseTupleAndKeywords(args, kwdict, "OOO|OO:interp", kwlist,
537537
&x, &xp, &fp, &left, &right)) {
538538
return NULL;
539539
}
@@ -686,8 +686,8 @@ arr_interp_complex(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwdict)
686686

687687
NPY_BEGIN_THREADS_DEF;
688688

689-
if (!PyArg_ParseTupleAndKeywords(args, kwdict, "OOO|OO", kwlist,
690-
&x, &xp, &fp, &left, &right)) {
689+
if (!PyArg_ParseTupleAndKeywords(args, kwdict, "OOO|OO:interp_complex",
690+
kwlist, &x, &xp, &fp, &left, &right)) {
691691
return NULL;
692692
}
693693

@@ -1409,13 +1409,13 @@ arr_add_docstring(PyObject *NPY_UNUSED(dummy), PyObject *args)
14091409
}
14101410

14111411
#if defined(NPY_PY3K)
1412-
if (!PyArg_ParseTuple(args, "OO!", &obj, &PyUnicode_Type, &str)) {
1412+
if (!PyArg_ParseTuple(args, "OO!:add_docstring", &obj, &PyUnicode_Type, &str)) {
14131413
return NULL;
14141414
}
14151415

14161416
docstr = PyBytes_AS_STRING(PyUnicode_AsUTF8String(str));
14171417
#else
1418-
if (!PyArg_ParseTuple(args, "OO!", &obj, &PyString_Type, &str)) {
1418+
if (!PyArg_ParseTuple(args, "OO!:add_docstring", &obj, &PyString_Type, &str)) {
14191419
return NULL;
14201420
}
14211421

@@ -1805,7 +1805,7 @@ io_pack(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwds)
18051805
int axis = NPY_MAXDIMS;
18061806
static char *kwlist[] = {"in", "axis", NULL};
18071807

1808-
if (!PyArg_ParseTupleAndKeywords( args, kwds, "O|O&" , kwlist,
1808+
if (!PyArg_ParseTupleAndKeywords( args, kwds, "O|O&:pack" , kwlist,
18091809
&obj, PyArray_AxisConverter, &axis)) {
18101810
return NULL;
18111811
}
@@ -1819,7 +1819,7 @@ io_unpack(PyObject *NPY_UNUSED(self), PyObject *args, PyObject *kwds)
18191819
int axis = NPY_MAXDIMS;
18201820
static char *kwlist[] = {"in", "axis", NULL};
18211821

1822-
if (!PyArg_ParseTupleAndKeywords( args, kwds, "O|O&" , kwlist,
1822+
if (!PyArg_ParseTupleAndKeywords( args, kwds, "O|O&:unpack" , kwlist,
18231823
&obj, PyArray_AxisConverter, &axis)) {
18241824
return NULL;
18251825
}

‎numpy/core/src/multiarray/descriptor.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ array_set_typeDict(PyObject *NPY_UNUSED(ignored), PyObject *args)
152152
{
153153
PyObject *dict;
154154

155-
if (!PyArg_ParseTuple(args, "O", &dict)) {
155+
if (!PyArg_ParseTuple(args, "O:set_typeDict", &dict)) {
156156
return NULL;
157157
}
158158
/* Decrement old reference (if any)*/
@@ -2267,7 +2267,7 @@ arraydescr_new(PyTypeObject *NPY_UNUSED(subtype),
22672267

22682268
static char *kwlist[] = {"dtype", "align", "copy", "metadata", NULL};
22692269

2270-
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O&O&O!", kwlist,
2270+
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O&O&O!:dtype", kwlist,
22712271
&odescr,
22722272
PyArray_BoolConverter, &align,
22732273
PyArray_BoolConverter, &copy,
@@ -2566,37 +2566,41 @@ arraydescr_setstate(PyArray_Descr *self, PyObject *args)
25662566
}
25672567
switch (PyTuple_GET_SIZE(PyTuple_GET_ITEM(args,0))) {
25682568
case 9:
2569-
if (!PyArg_ParseTuple(args, "(iOOOOiiiO)", &version, &endian_obj,
2569+
if (!PyArg_ParseTuple(args, "(iOOOOiiiO):__setstate__",
2570+
&version, &endian_obj,
25702571
&subarray, &names, &fields, &elsize,
25712572
&alignment, &int_dtypeflags, &metadata)) {
25722573
PyErr_Clear();
25732574
return NULL;
25742575
}
25752576
break;
25762577
case 8:
2577-
if (!PyArg_ParseTuple(args, "(iOOOOiii)", &version, &endian_obj,
2578+
if (!PyArg_ParseTuple(args, "(iOOOOiii):__setstate__",
2579+
&version, &endian_obj,
25782580
&subarray, &names, &fields, &elsize,
25792581
&alignment, &int_dtypeflags)) {
25802582
return NULL;
25812583
}
25822584
break;
25832585
case 7:
2584-
if (!PyArg_ParseTuple(args, "(iOOOOii)", &version, &endian_obj,
2586+
if (!PyArg_ParseTuple(args, "(iOOOOii):__setstate__",
2587+
&version, &endian_obj,
25852588
&subarray, &names, &fields, &elsize,
25862589
&alignment)) {
25872590
return NULL;
25882591
}
25892592
break;
25902593
case 6:
2591-
if (!PyArg_ParseTuple(args, "(iOOOii)", &version,
2594+
if (!PyArg_ParseTuple(args, "(iOOOii):__setstate__",
2595+
&version,
25922596
&endian_obj, &subarray, &fields,
25932597
&elsize, &alignment)) {
25942598
return NULL;
25952599
}
25962600
break;
25972601
case 5:
25982602
version = 0;
2599-
if (!PyArg_ParseTuple(args, "(OOOii)",
2603+
if (!PyArg_ParseTuple(args, "(OOOii):__setstate__",
26002604
&endian_obj, &subarray, &fields, &elsize,
26012605
&alignment)) {
26022606
return NULL;
@@ -3082,7 +3086,7 @@ arraydescr_newbyteorder(PyArray_Descr *self, PyObject *args)
30823086
{
30833087
char endian=NPY_SWAP;
30843088

3085-
if (!PyArg_ParseTuple(args, "|O&", PyArray_ByteorderConverter,
3089+
if (!PyArg_ParseTuple(args, "|O&:newbyteorder", PyArray_ByteorderConverter,
30863090
&endian)) {
30873091
return NULL;
30883092
}

0 commit comments

Comments
 (0)
0