mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #29286: Rename private PyArg_UnpackStack_impl() to unpack_stack()

Browse source 
Rename also "l" argument to "nargs".
This commit is contained in:
Victor Stinner 2017-02-01 17:42:18 +01:00
parent 122fb562d4
commit fdbc397f4d
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Python/getargs.c
View file

@ -2352,8 +2352,8 @@ err:
static int static int
PyArg_UnpackStack_impl(PyObject **args, Py_ssize_t l, const char *name, unpack_stack(PyObject **args, Py_ssize_t nargs, const char *name,
Py_ssize_t min, Py_ssize_t max, va_list vargs) Py_ssize_t min, Py_ssize_t max, va_list vargs)
{ {
Py_ssize_t i; Py_ssize_t i;
PyObject **o; PyObject **o;
@ -2361,41 +2361,41 @@ PyArg_UnpackStack_impl(PyObject **args, Py_ssize_t l, const char *name,
assert(min >= 0); assert(min >= 0);
assert(min <= max); assert(min <= max);
if (l < min) { if (nargs < min) {
if (name != NULL) if (name != NULL)
PyErr_Format( PyErr_Format(
PyExc_TypeError, PyExc_TypeError,
"%s expected %s%zd arguments, got %zd", "%s expected %s%zd arguments, got %zd",
name, (min == max ? "" : "at least "), min, l); name, (min == max ? "" : "at least "), min, nargs);
else else
PyErr_Format( PyErr_Format(
PyExc_TypeError, PyExc_TypeError,
"unpacked tuple should have %s%zd elements," "unpacked tuple should have %s%zd elements,"
" but has %zd", " but has %zd",
(min == max ? "" : "at least "), min, l); (min == max ? "" : "at least "), min, nargs);
return 0; return 0;
} }
if (l == 0) { if (nargs == 0) {
return 1; return 1;
} }
if (l > max) { if (nargs > max) {
if (name != NULL) if (name != NULL)
PyErr_Format( PyErr_Format(
PyExc_TypeError, PyExc_TypeError,
"%s expected %s%zd arguments, got %zd", "%s expected %s%zd arguments, got %zd",
name, (min == max ? "" : "at most "), max, l); name, (min == max ? "" : "at most "), max, nargs);
else else
PyErr_Format( PyErr_Format(
PyExc_TypeError, PyExc_TypeError,
"unpacked tuple should have %s%zd elements," "unpacked tuple should have %s%zd elements,"
" but has %zd", " but has %zd",
(min == max ? "" : "at most "), max, l); (min == max ? "" : "at most "), max, nargs);
return 0; return 0;
} }
for (i = 0; i < l; i++) { for (i = 0; i < nargs; i++) {
o = va_arg(vargs, PyObject **); o = va_arg(vargs, PyObject **);
*o = args[i]; *o = args[i];
} }
@ -2423,7 +2423,7 @@ PyArg_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t m
#else #else
va_start(vargs); va_start(vargs);
#endif #endif
retval = PyArg_UnpackStack_impl(stack, nargs, name, min, max, vargs); retval = unpack_stack(stack, nargs, name, min, max, vargs);
va_end(vargs); va_end(vargs);
return retval; return retval;
} }
@ -2440,7 +2440,7 @@ _PyArg_UnpackStack(PyObject **args, Py_ssize_t nargs, const char *name,
#else #else
va_start(vargs); va_start(vargs);
#endif #endif
retval = PyArg_UnpackStack_impl(args, nargs, name, min, max, vargs); retval = unpack_stack(args, nargs, name, min, max, vargs);
va_end(vargs); va_end(vargs);
return retval; return retval;
} }