Skip to content

gh-146615: Fix format specifiers in Python/ directory #146619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sunmy2019 wants to merge 2 commits into
base: main
Choose a base branch
from
+13 −13
Open

gh-146615: Fix format specifiers in Python/ directory #146619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec764c1
Fix format specifiers in error messages to use size_t for argument co…
sunmy2019 Mar 30, 2026
97614e5
resolve comments
sunmy2019 Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Python/bltinmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,7 +1607,7 @@ map_next(PyObject *self)
// ValueError: map() argument 3 is shorter than arguments 1-2
const char* plural = i == 1 ? " " : "s 1-";
PyErr_Format(PyExc_ValueError,
"map() argument %d is shorter than argument%s%d",
"map() argument %zd is shorter than argument%s%zd",
i + 1, plural, i);
goto exit_no_result;
}
Expand All @@ -1618,7 +1618,7 @@ map_next(PyObject *self)
Py_DECREF(val);
const char* plural = i == 1 ? " " : "s 1-";
PyErr_Format(PyExc_ValueError,
"map() argument %d is longer than argument%s%d",
"map() argument %zd is longer than argument%s%zd",
i + 1, plural, i);
goto exit_no_result;
}
Expand Down Expand Up @@ -3307,7 +3307,7 @@ zip_next(PyObject *self)
// ValueError: zip() argument 3 is shorter than arguments 1-2
const char* plural = i == 1 ? " " : "s 1-";
return PyErr_Format(PyExc_ValueError,
"zip() argument %d is shorter than argument%s%d",
"zip() argument %zd is shorter than argument%s%zd",
i + 1, plural, i);
}
for (i = 1; i < tuplesize; i++) {
Expand All @@ -3317,7 +3317,7 @@ zip_next(PyObject *self)
Py_DECREF(item);
const char* plural = i == 1 ? " " : "s 1-";
return PyErr_Format(PyExc_ValueError,
"zip() argument %d is longer than argument%s%d",
"zip() argument %zd is longer than argument%s%zd",
i + 1, plural, i);
}
if (PyErr_Occurred()) {
Expand Down
4 changes: 2 additions & 2 deletions Python/ceval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ _PyEval_MatchClass(PyThreadState *tstate, PyObject *subject, PyObject *type,
if (allowed < nargs) {
const char *plural = (allowed == 1) ? "" : "s";
_PyErr_Format(tstate, PyExc_TypeError,
"%s() accepts %d positional sub-pattern%s (%d given)",
"%s() accepts %zd positional sub-pattern%s (%zd given)",
((PyTypeObject*)type)->tp_name,
allowed, plural, nargs);
goto fail;
Expand Down Expand Up @@ -1555,7 +1555,7 @@ format_missing(PyThreadState *tstate, const char *kind,
if (name_str == NULL)
return;
_PyErr_Format(tstate, PyExc_TypeError,
"%U() missing %i required %s argument%s: %U",
"%U() missing %zd required %s argument%s: %U",
qualname,
len,
kind,
Expand Down
2 changes: 1 addition & 1 deletion Python/crossinterp_data_lookup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ _PyBytes_GetXIDataWrapped(PyThreadState *tstate,
return NULL;
}
if (size < sizeof(_PyBytes_data_t)) {
PyErr_Format(PyExc_ValueError, "expected size >= %d, got %d",
PyErr_Format(PyExc_ValueError, "expected size >= %zu, got %zu",
sizeof(_PyBytes_data_t), size);
return NULL;
}
Expand Down
6 changes: 3 additions & 3 deletions Python/getargs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2421,7 +2421,7 @@ vgetargskeywordsfast_impl(PyObject *const *args, Py_ssize_t nargs,
if (i < parser->min) {
/* Less arguments than required */
if (i < pos) {
Py_ssize_t min = Py_MIN(pos, parser->min);
int min = Py_MIN(pos, parser->min);
PyErr_Format(PyExc_TypeError,
"%.200s%s takes %s %d positional argument%s"
" (%zd given)",
Expand All @@ -2435,7 +2435,7 @@ vgetargskeywordsfast_impl(PyObject *const *args, Py_ssize_t nargs,
else {
keyword = PyTuple_GET_ITEM(kwtuple, i - pos);
PyErr_Format(PyExc_TypeError, "%.200s%s missing required "
"argument '%U' (pos %d)",
"argument '%U' (pos %zd)",
(parser->fname == NULL) ? "function" : parser->fname,
(parser->fname == NULL) ? "" : "()",
keyword, i+1);
Expand Down Expand Up @@ -2476,7 +2476,7 @@ vgetargskeywordsfast_impl(PyObject *const *args, Py_ssize_t nargs,
/* arg present in tuple and in dict */
PyErr_Format(PyExc_TypeError,
"argument for %.200s%s given by name ('%U') "
"and position (%d)",
"and position (%zd)",
(parser->fname == NULL) ? "function" : parser->fname,
(parser->fname == NULL) ? "" : "()",
keyword, i+1);
Expand Down
2 changes: 1 addition & 1 deletion Python/interpconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ interp_config_from_dict(PyObject *origdict, PyInterpreterConfig *config,
}
else if (unused > 0) {
PyErr_Format(PyExc_ValueError,
"config dict has %d extra items (%R)", unused, dict);
"config dict has %zd extra items (%R)", unused, dict);
goto error;
}

Expand Down
4 changes: 2 additions & 2 deletions Python/pythonrun.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1382,11 +1382,11 @@ get_interactive_filename(PyObject *filename, Py_ssize_t count)
if (middle == NULL) {
return NULL;
}
result = PyUnicode_FromFormat("<%U-%d>", middle, count);
result = PyUnicode_FromFormat("<%U-%zd>", middle, count);
Py_DECREF(middle);
} else {
result = PyUnicode_FromFormat(
"%U-%d", filename, count);
"%U-%zd", filename, count);
}
return result;

Expand Down
Loading