bpo-37034: Display argument name on errors with keyword arguments with Argument Clinic. (GH-13593)
diff --git a/Modules/clinic/_ssl.c.h b/Modules/clinic/_ssl.c.h
index adef7db..25769a2 100644
--- a/Modules/clinic/_ssl.c.h
+++ b/Modules/clinic/_ssl.c.h
@@ -222,7 +222,7 @@
goto exit;
}
if (!PyBuffer_IsContiguous(&b, 'C')) {
- _PyArg_BadArgument("write", 0, "contiguous buffer", arg);
+ _PyArg_BadArgument("write", "argument", "contiguous buffer", arg);
goto exit;
}
return_value = _ssl__SSLSocket_write_impl(self, &b);
@@ -353,7 +353,7 @@
goto skip_optional_pos;
}
if (!PyUnicode_Check(args[0])) {
- _PyArg_BadArgument("get_channel_binding", 1, "str", args[0]);
+ _PyArg_BadArgument("get_channel_binding", "argument 'cb_type'", "str", args[0]);
goto exit;
}
Py_ssize_t cb_type_length;
@@ -439,7 +439,7 @@
const char *cipherlist;
if (!PyUnicode_Check(arg)) {
- _PyArg_BadArgument("set_ciphers", 0, "str", arg);
+ _PyArg_BadArgument("set_ciphers", "argument", "str", arg);
goto exit;
}
Py_ssize_t cipherlist_length;
@@ -500,7 +500,7 @@
goto exit;
}
if (!PyBuffer_IsContiguous(&protos, 'C')) {
- _PyArg_BadArgument("_set_npn_protocols", 0, "contiguous buffer", arg);
+ _PyArg_BadArgument("_set_npn_protocols", "argument", "contiguous buffer", arg);
goto exit;
}
return_value = _ssl__SSLContext__set_npn_protocols_impl(self, &protos);
@@ -536,7 +536,7 @@
goto exit;
}
if (!PyBuffer_IsContiguous(&protos, 'C')) {
- _PyArg_BadArgument("_set_alpn_protocols", 0, "contiguous buffer", arg);
+ _PyArg_BadArgument("_set_alpn_protocols", "argument", "contiguous buffer", arg);
goto exit;
}
return_value = _ssl__SSLContext__set_alpn_protocols_impl(self, &protos);
@@ -690,7 +690,7 @@
goto exit;
}
if (!PyObject_TypeCheck(args[0], PySocketModule.Sock_Type)) {
- _PyArg_BadArgument("_wrap_socket", 1, (PySocketModule.Sock_Type)->tp_name, args[0]);
+ _PyArg_BadArgument("_wrap_socket", "argument 'sock'", (PySocketModule.Sock_Type)->tp_name, args[0]);
goto exit;
}
sock = args[0];
@@ -765,12 +765,12 @@
goto exit;
}
if (!PyObject_TypeCheck(args[0], &PySSLMemoryBIO_Type)) {
- _PyArg_BadArgument("_wrap_bio", 1, (&PySSLMemoryBIO_Type)->tp_name, args[0]);
+ _PyArg_BadArgument("_wrap_bio", "argument 'incoming'", (&PySSLMemoryBIO_Type)->tp_name, args[0]);
goto exit;
}
incoming = (PySSLMemoryBIO *)args[0];
if (!PyObject_TypeCheck(args[1], &PySSLMemoryBIO_Type)) {
- _PyArg_BadArgument("_wrap_bio", 2, (&PySSLMemoryBIO_Type)->tp_name, args[1]);
+ _PyArg_BadArgument("_wrap_bio", "argument 'outgoing'", (&PySSLMemoryBIO_Type)->tp_name, args[1]);
goto exit;
}
outgoing = (PySSLMemoryBIO *)args[1];
@@ -1017,7 +1017,7 @@
goto exit;
}
if (!PyBuffer_IsContiguous(&b, 'C')) {
- _PyArg_BadArgument("write", 0, "contiguous buffer", arg);
+ _PyArg_BadArgument("write", "argument", "contiguous buffer", arg);
goto exit;
}
return_value = _ssl_MemoryBIO_write_impl(self, &b);
@@ -1089,7 +1089,7 @@
goto exit;
}
if (!PyBuffer_IsContiguous(&view, 'C')) {
- _PyArg_BadArgument("RAND_add", 1, "contiguous buffer", args[0]);
+ _PyArg_BadArgument("RAND_add", "argument 1", "contiguous buffer", args[0]);
goto exit;
}
}
@@ -1289,7 +1289,7 @@
goto exit;
}
if (!PyUnicode_Check(args[0])) {
- _PyArg_BadArgument("txt2obj", 1, "str", args[0]);
+ _PyArg_BadArgument("txt2obj", "argument 'txt'", "str", args[0]);
goto exit;
}
Py_ssize_t txt_length;
@@ -1382,7 +1382,7 @@
goto exit;
}
if (!PyUnicode_Check(args[0])) {
- _PyArg_BadArgument("enum_certificates", 1, "str", args[0]);
+ _PyArg_BadArgument("enum_certificates", "argument 'store_name'", "str", args[0]);
goto exit;
}
Py_ssize_t store_name_length;
@@ -1435,7 +1435,7 @@
goto exit;
}
if (!PyUnicode_Check(args[0])) {
- _PyArg_BadArgument("enum_crls", 1, "str", args[0]);
+ _PyArg_BadArgument("enum_crls", "argument 'store_name'", "str", args[0]);
goto exit;
}
Py_ssize_t store_name_length;
@@ -1482,4 +1482,4 @@
#ifndef _SSL_ENUM_CRLS_METHODDEF
#define _SSL_ENUM_CRLS_METHODDEF
#endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */
-/*[clinic end generated code: output=5003112e167cd948 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=aa4947067c3fef2d input=a9049054013a1b77]*/