[3.14] gh-146615: Fix format specifiers in extension modules (GH-146617) (GH-146652)

serhiy-storchaka · sunmy2019 · web-flow · commit 58c7259133be · 2026-03-31T10:07:09.000Z
(cherry picked from commit 1c396e1) Co-authored-by: sunmy2019 <59365878+sunmy2019@users.noreply.github.com>
diff --git a/Modules/_asynciomodule.c b/Modules/_asynciomodule.c
@@ -2255,7 +2255,7 @@ enter_task(PyObject *loop, PyObject *task)
             PyExc_RuntimeError,
             "Cannot enter into task %R while another " \
             "task %R is being executed.",
-            task, ts->asyncio_running_task, NULL);
+            task, ts->asyncio_running_task);
         return -1;
     }
 
@@ -2278,7 +2278,7 @@ leave_task(PyObject *loop, PyObject *task)
             PyExc_RuntimeError,
             "Invalid attempt to leave task %R while " \
             "task %R is entered.",
-            task, ts->asyncio_running_task ? ts->asyncio_running_task : Py_None, NULL);
+            task, ts->asyncio_running_task ? ts->asyncio_running_task : Py_None);
         return -1;
     }
     Py_CLEAR(ts->asyncio_running_task);
@@ -2343,7 +2343,7 @@ _asyncio_Task___init___impl(TaskObj *self, PyObject *coro, PyObject *loop,
         self->task_log_destroy_pending = 0;
         PyErr_Format(PyExc_TypeError,
                      "a coroutine was expected, got %R",
-                     coro, NULL);
+                     coro);
         return -1;
     }
 
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -577,7 +577,7 @@ fill_and_set_sslerror(_sslmodulestate *state,
     }
     else {
         if (PyUnicodeWriter_Format(
-                writer, "unknown error (0x%x)", errcode) < 0) {
+                writer, "unknown error (0x%lx)", errcode) < 0) {
             goto fail;
         }
     }
@@ -3597,15 +3597,11 @@ _ssl__SSLContext_verify_flags_set_impl(PySSLContext *self, PyObject *value)
 static int
 set_min_max_proto_version(PySSLContext *self, PyObject *arg, int what)
 {
-    long v;
+    int v;
     int result;
 
-    if (!PyArg_Parse(arg, "l", &v))
+    if (!PyArg_Parse(arg, "i", &v))
         return -1;
-    if (v > INT_MAX) {
-        PyErr_SetString(PyExc_OverflowError, "Option is too long");
-        return -1;
-    }
 
     switch(self->protocol) {
     case PY_SSL_VERSION_TLS_CLIENT: _Py_FALLTHROUGH;
@@ -3640,7 +3636,7 @@ set_min_max_proto_version(PySSLContext *self, PyObject *arg, int what)
             break;
         default:
             PyErr_Format(PyExc_ValueError,
-                     "Unsupported TLS/SSL version 0x%x", v);
+                     "Unsupported TLS/SSL version 0x%x", (unsigned)v);
             return -1;
     }
 
@@ -3674,7 +3670,7 @@ set_min_max_proto_version(PySSLContext *self, PyObject *arg, int what)
     }
     if (result == 0) {
         PyErr_Format(PyExc_ValueError,
-                     "Unsupported protocol version 0x%x", v);
+                     "Unsupported protocol version 0x%x", (unsigned)v);
         return -1;
     }
     return 0;
diff --git a/Modules/_zoneinfo.c b/Modules/_zoneinfo.c
@@ -988,7 +988,7 @@ load_data(zoneinfo_state *state, PyZoneInfo_ZoneInfo *self, PyObject *file_obj)
     }
 
     if (!PyTuple_CheckExact(data_tuple)) {
-        PyErr_Format(PyExc_TypeError, "Invalid data result type: %r",
+        PyErr_Format(PyExc_TypeError, "Invalid data result type: %R",
                      data_tuple);
         goto error;
     }

Original file line number	Diff line number	Diff line change
`@@ -577,7 +577,7 @@ fill_and_set_sslerror(_sslmodulestate *state,`
`577`	`577`	`}`
`578`	`578`	`else {`
`579`	`579`	`if (PyUnicodeWriter_Format(`
`580`		`- writer, "unknown error (0x%x)", errcode) < 0) {`
	`580`	`+ writer, "unknown error (0x%lx)", errcode) < 0) {`
`581`	`581`	`goto fail;`
`582`	`582`	`}`
`583`	`583`	`}`
`@@ -3597,15 +3597,11 @@ _ssl__SSLContext_verify_flags_set_impl(PySSLContext self, PyObject value)`
`3597`	`3597`	`static int`
`3598`	`3598`	`set_min_max_proto_version(PySSLContext self, PyObject arg, int what)`
`3599`	`3599`	`{`
`3600`		`- long v;`
	`3600`	`+ int v;`
`3601`	`3601`	`int result;`
`3602`	`3602`
`3603`		`- if (!PyArg_Parse(arg, "l", &v))`
	`3603`	`+ if (!PyArg_Parse(arg, "i", &v))`
`3604`	`3604`	`return -1;`
`3605`		`- if (v > INT_MAX) {`
`3606`		`- PyErr_SetString(PyExc_OverflowError, "Option is too long");`
`3607`		`- return -1;`
`3608`		`- }`
`3609`	`3605`
`3610`	`3606`	`switch(self->protocol) {`
`3611`	`3607`	`case PY_SSL_VERSION_TLS_CLIENT: _Py_FALLTHROUGH;`
`@@ -3640,7 +3636,7 @@ set_min_max_proto_version(PySSLContext self, PyObject arg, int what)`
`3640`	`3636`	`break;`
`3641`	`3637`	`default:`
`3642`	`3638`	`PyErr_Format(PyExc_ValueError,`
`3643`		`- "Unsupported TLS/SSL version 0x%x", v);`
	`3639`	`+ "Unsupported TLS/SSL version 0x%x", (unsigned)v);`
`3644`	`3640`	`return -1;`
`3645`	`3641`	`}`
`3646`	`3642`
`@@ -3674,7 +3670,7 @@ set_min_max_proto_version(PySSLContext self, PyObject arg, int what)`
`3674`	`3670`	`}`
`3675`	`3671`	`if (result == 0) {`
`3676`	`3672`	`PyErr_Format(PyExc_ValueError,`
`3677`		`- "Unsupported protocol version 0x%x", v);`
	`3673`	`+ "Unsupported protocol version 0x%x", (unsigned)v);`
`3678`	`3674`	`return -1;`
`3679`	`3675`	`}`
`3680`	`3676`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -988,7 +988,7 @@ load_data(zoneinfo_state state, PyZoneInfo_ZoneInfo self, PyObject *file_obj)`
`988`	`988`	`}`
`989`	`989`
`990`	`990`	`if (!PyTuple_CheckExact(data_tuple)) {`
`991`		`- PyErr_Format(PyExc_TypeError, "Invalid data result type: %r",`
	`991`	`+ PyErr_Format(PyExc_TypeError, "Invalid data result type: %R",`
`992`	`992`	`data_tuple);`
`993`	`993`	`goto error;`
`994`	`994`	`}`