gh-146615: Fix format specifiers in Python/ directory (GH-146619)
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 5680e89..fec64e1 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -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;
}
@@ -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;
}
@@ -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++) {
@@ -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()) {
diff --git a/Python/ceval.c b/Python/ceval.c
index 49aeffc..bf550f2 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -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;
@@ -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,
diff --git a/Python/crossinterp_data_lookup.h b/Python/crossinterp_data_lookup.h
index c3c76ae..cf84633 100644
--- a/Python/crossinterp_data_lookup.h
+++ b/Python/crossinterp_data_lookup.h
@@ -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;
}
diff --git a/Python/getargs.c b/Python/getargs.c
index 31cd4ad..3f42326 100644
--- a/Python/getargs.c
+++ b/Python/getargs.c
@@ -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)",
@@ -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);
@@ -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);
diff --git a/Python/interpconfig.c b/Python/interpconfig.c
index 1add8a8..a37bd3f 100644
--- a/Python/interpconfig.c
+++ b/Python/interpconfig.c
@@ -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;
}
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 1e32784..971ab06 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -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;
