mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-112234: Remove the toplevel parameter in converttuple() (GH-112235)

Browse source 
It is and always was 0.
This commit is contained in:
Serhiy Storchaka 2023-11-18 13:47:34 +02:00 • committed by GitHub
parent 0566ab9c4d
commit 91d1730541
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Python/getargs.c
View file

@ -47,7 +47,7 @@ static void seterror(Py_ssize_t, const char *, int *, const char *, const char *
static const char *convertitem(PyObject *, const char **, va_list *, int, int *, static const char *convertitem(PyObject *, const char **, va_list *, int, int *,
char *, size_t, freelist_t *); char *, size_t, freelist_t *);
static const char *converttuple(PyObject *, const char **, va_list *, int, static const char *converttuple(PyObject *, const char **, va_list *, int,
int *, char *, size_t, int, freelist_t *); int *, char *, size_t, freelist_t *);
static const char *convertsimple(PyObject *, const char **, va_list *, int, static const char *convertsimple(PyObject *, const char **, va_list *, int,
char *, size_t, freelist_t *); char *, size_t, freelist_t *);
static Py_ssize_t convertbuffer(PyObject *, const void **p, const char **); static Py_ssize_t convertbuffer(PyObject *, const void **p, const char **);
@ -454,7 +454,7 @@ seterror(Py_ssize_t iarg, const char *msg, int *levels, const char *fname,
static const char * static const char *
converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags, converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
int *levels, char *msgbuf, size_t bufsize, int toplevel, int *levels, char *msgbuf, size_t bufsize,
freelist_t *freelist) freelist_t *freelist)
{ {
int level = 0; int level = 0;
@ -484,7 +484,6 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
if (!PySequence_Check(arg) || PyBytes_Check(arg)) { if (!PySequence_Check(arg) || PyBytes_Check(arg)) {
levels[0] = 0; levels[0] = 0;
PyOS_snprintf(msgbuf, bufsize, PyOS_snprintf(msgbuf, bufsize,
toplevel ? "expected %d arguments, not %.50s" :
"must be %d-item sequence, not %.50s", "must be %d-item sequence, not %.50s",
n, n,
arg == Py_None ? "None" : Py_TYPE(arg)->tp_name); arg == Py_None ? "None" : Py_TYPE(arg)->tp_name);
@ -494,18 +493,9 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
len = PySequence_Size(arg); len = PySequence_Size(arg);
if (len != n) { if (len != n) {
levels[0] = 0; levels[0] = 0;
if (toplevel) { PyOS_snprintf(msgbuf, bufsize,
PyOS_snprintf(msgbuf, bufsize, "must be sequence of length %d, not %zd",
"expected %d argument%s, not %zd", n, len);
n,
n == 1 ? "" : "s",
len);
}
else {
PyOS_snprintf(msgbuf, bufsize,
"must be sequence of length %d, not %zd",
n, len);
}
return msgbuf; return msgbuf;
} }
@ -548,7 +538,7 @@ convertitem(PyObject *arg, const char **p_format, va_list *p_va, int flags,
if (*format == '(' /* ')' */) { if (*format == '(' /* ')' */) {
format++; format++;
msg = converttuple(arg, &format, p_va, flags, levels, msgbuf, msg = converttuple(arg, &format, p_va, flags, levels, msgbuf,
bufsize, 0, freelist); bufsize, freelist);
if (msg == NULL) if (msg == NULL)
format++; format++;
} }