Skip to content

Commit 91d1730

Browse files
gh-112234: Remove the toplevel parameter in converttuple() (GH-112235)
It is and always was 0.
1 parent 0566ab9 commit 91d1730

File tree

1 file changed

+6
-16
lines changed

1 file changed

+6
-16
lines changed

Python/getargs.c

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static void seterror(Py_ssize_t, const char *, int *, const char *, const char *
4747
static const char *convertitem(PyObject *, const char **, va_list *, int, int *,
4848
char *, size_t, freelist_t *);
4949
static const char *converttuple(PyObject *, const char **, va_list *, int,
50-
int *, char *, size_t, int, freelist_t *);
50+
int *, char *, size_t, freelist_t *);
5151
static const char *convertsimple(PyObject *, const char **, va_list *, int,
5252
char *, size_t, freelist_t *);
5353
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,
454454

455455
static const char *
456456
converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
457-
int *levels, char *msgbuf, size_t bufsize, int toplevel,
457+
int *levels, char *msgbuf, size_t bufsize,
458458
freelist_t *freelist)
459459
{
460460
int level = 0;
@@ -484,7 +484,6 @@ converttuple(PyObject *arg, const char **p_format, va_list *p_va, int flags,
484484
if (!PySequence_Check(arg) || PyBytes_Check(arg)) {
485485
levels[0] = 0;
486486
PyOS_snprintf(msgbuf, bufsize,
487-
toplevel ? "expected %d arguments, not %.50s" :
488487
"must be %d-item sequence, not %.50s",
489488
n,
490489
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,
494493
len = PySequence_Size(arg);
495494
if (len != n) {
496495
levels[0] = 0;
497-
if (toplevel) {
498-
PyOS_snprintf(msgbuf, bufsize,
499-
"expected %d argument%s, not %zd",
500-
n,
501-
n == 1 ? "" : "s",
502-
len);
503-
}
504-
else {
505-
PyOS_snprintf(msgbuf, bufsize,
506-
"must be sequence of length %d, not %zd",
507-
n, len);
508-
}
496+
PyOS_snprintf(msgbuf, bufsize,
497+
"must be sequence of length %d, not %zd",
498+
n, len);
509499
return msgbuf;
510500
}
511501

@@ -548,7 +538,7 @@ convertitem(PyObject *arg, const char **p_format, va_list *p_va, int flags,
548538
if (*format == '(' /* ')' */) {
549539
format++;
550540
msg = converttuple(arg, &format, p_va, flags, levels, msgbuf,
551-
bufsize, 0, freelist);
541+
bufsize, freelist);
552542
if (msg == NULL)
553543
format++;
554544
}

0 commit comments

Comments
 (0)