Issues #26716, #26057: Regenerate Argument Clinic code.

5 files changed, 52 insertions, 43 deletions

diff --git a/Modules/clinic/_codecsmodule.c.h b/Modules/clinic/_codecsmodule.c.h
index e94be1176e..29f46bbb04 100644
--- a/Modules/clinic/_codecsmodule.c.h
+++ b/Modules/clinic/_codecsmodule.c.h
@@ -878,7 +878,7 @@ _codecs_utf_7_encode(PyModuleDef *module, PyObject *args)
     PyObject *str;
     const char *errors = NULL;
 
-    if (!PyArg_ParseTuple(args, "O|z:utf_7_encode",
+    if (!PyArg_ParseTuple(args, "U|z:utf_7_encode",
         &str, &errors))
         goto exit;
     return_value = _codecs_utf_7_encode_impl(module, str, errors);
@@ -906,7 +906,7 @@ _codecs_utf_8_encode(PyModuleDef *module, PyObject *args)
     PyObject *str;
     const char *errors = NULL;
 
-    if (!PyArg_ParseTuple(args, "O|z:utf_8_encode",
+    if (!PyArg_ParseTuple(args, "U|z:utf_8_encode",
         &str, &errors))
         goto exit;
     return_value = _codecs_utf_8_encode_impl(module, str, errors);
@@ -935,7 +935,7 @@ _codecs_utf_16_encode(PyModuleDef *module, PyObject *args)
     const char *errors = NULL;
     int byteorder = 0;
 
-    if (!PyArg_ParseTuple(args, "O|zi:utf_16_encode",
+    if (!PyArg_ParseTuple(args, "U|zi:utf_16_encode",
         &str, &errors, &byteorder))
         goto exit;
     return_value = _codecs_utf_16_encode_impl(module, str, errors, byteorder);
@@ -963,7 +963,7 @@ _codecs_utf_16_le_encode(PyModuleDef *module, PyObject *args)
     PyObject *str;
     const char *errors = NULL;
 
-    if (!PyArg_ParseTuple(args, "O|z:utf_16_le_encode",
+    if (!PyArg_ParseTuple(args, "U|z:utf_16_le_encode",
         &str, &errors))
         goto exit;
     return_value = _codecs_utf_16_le_encode_impl(module, str, errors);
@@ -991,7 +991,7 @@ _codecs_utf_16_be_encode(PyModuleDef *module, PyObject *args)
     PyObject *str;
     const char *errors = NULL;
 
-    if (!PyArg_ParseTuple(args, "O|z:utf_16_be_encode",
+    if (!PyArg_ParseTuple(args, "U|z:utf_16_be_encode",
         &str, &errors))
         goto exit;
     return_value = _codecs_utf_16_be_encode_impl(module, str, errors);
@@ -1020,7 +1020,7 @@ _codecs_utf_32_encode(PyModuleDef *module, PyObject *args)
     const char *errors = NULL;
     int byteorder = 0;
 
-    if (!PyArg_ParseTuple(args, "O|zi:utf_32_encode",
+    if (!PyArg_ParseTuple(args, "U|zi:utf_32_encode",
         &str, &errors, &byteorder))
         goto exit;
     return_value = _codecs_utf_32_encode_impl(module, str, errors, byteorder);
@@ -1048,7 +1048,7 @@ _codecs_utf_32_le_encode(PyModuleDef *module, PyObject *args)
     PyObject *str;
     const char *errors = NULL;
 
-    if (!PyArg_ParseTuple(args, "O|z:utf_32_le_encode",
+    if (!PyArg_ParseTuple(args, "U|z:utf_32_le_encode",
         &str, &errors))
         goto exit;
     return_value = _codecs_utf_32_le_encode_impl(module, str, errors);
@@ -1076,7 +1076,7 @@ _codecs_utf_32_be_encode(PyModuleDef *module, PyObject *args)
     PyObject *str;
     const char *errors = NULL;
 
-    if (!PyArg_ParseTuple(args, "O|z:utf_32_be_encode",
+    if (!PyArg_ParseTuple(args, "U|z:utf_32_be_encode",
         &str, &errors))
         goto exit;
     return_value = _codecs_utf_32_be_encode_impl(module, str, errors);
@@ -1104,7 +1104,7 @@ _codecs_unicode_escape_encode(PyModuleDef *module, PyObject *args)
     PyObject *str;
     const char *errors = NULL;
 
-    if (!PyArg_ParseTuple(args, "O|z:unicode_escape_encode",
+    if (!PyArg_ParseTuple(args, "U|z:unicode_escape_encode",
         &str, &errors))
         goto exit;
     return_value = _codecs_unicode_escape_encode_impl(module, str, errors);
@@ -1132,7 +1132,7 @@ _codecs_raw_unicode_escape_encode(PyModuleDef *module, PyObject *args)
     PyObject *str;
     const char *errors = NULL;
 
-    if (!PyArg_ParseTuple(args, "O|z:raw_unicode_escape_encode",
+    if (!PyArg_ParseTuple(args, "U|z:raw_unicode_escape_encode",
         &str, &errors))
         goto exit;
     return_value = _codecs_raw_unicode_escape_encode_impl(module, str, errors);
@@ -1160,7 +1160,7 @@ _codecs_latin_1_encode(PyModuleDef *module, PyObject *args)
     PyObject *str;
     const char *errors = NULL;
 
-    if (!PyArg_ParseTuple(args, "O|z:latin_1_encode",
+    if (!PyArg_ParseTuple(args, "U|z:latin_1_encode",
         &str, &errors))
         goto exit;
     return_value = _codecs_latin_1_encode_impl(module, str, errors);
@@ -1188,7 +1188,7 @@ _codecs_ascii_encode(PyModuleDef *module, PyObject *args)
     PyObject *str;
     const char *errors = NULL;
 
-    if (!PyArg_ParseTuple(args, "O|z:ascii_encode",
+    if (!PyArg_ParseTuple(args, "U|z:ascii_encode",
         &str, &errors))
         goto exit;
     return_value = _codecs_ascii_encode_impl(module, str, errors);
@@ -1217,7 +1217,7 @@ _codecs_charmap_encode(PyModuleDef *module, PyObject *args)
     const char *errors = NULL;
     PyObject *mapping = NULL;
 
-    if (!PyArg_ParseTuple(args, "O|zO:charmap_encode",
+    if (!PyArg_ParseTuple(args, "U|zO:charmap_encode",
         &str, &errors, &mapping))
         goto exit;
     return_value = _codecs_charmap_encode_impl(module, str, errors, mapping);
@@ -1272,7 +1272,7 @@ _codecs_mbcs_encode(PyModuleDef *module, PyObject *args)
     PyObject *str;
     const char *errors = NULL;
 
-    if (!PyArg_ParseTuple(args, "O|z:mbcs_encode",
+    if (!PyArg_ParseTuple(args, "U|z:mbcs_encode",
         &str, &errors))
         goto exit;
     return_value = _codecs_mbcs_encode_impl(module, str, errors);
@@ -1305,7 +1305,7 @@ _codecs_code_page_encode(PyModuleDef *module, PyObject *args)
     PyObject *str;
     const char *errors = NULL;
 
-    if (!PyArg_ParseTuple(args, "iO|z:code_page_encode",
+    if (!PyArg_ParseTuple(args, "iU|z:code_page_encode",
         &code_page, &str, &errors))
         goto exit;
     return_value = _codecs_code_page_encode_impl(module, code_page, str, errors);
@@ -1393,4 +1393,4 @@ exit:
 #ifndef _CODECS_CODE_PAGE_ENCODE_METHODDEF
     #define _CODECS_CODE_PAGE_ENCODE_METHODDEF
 #endif /* !defined(_CODECS_CODE_PAGE_ENCODE_METHODDEF) */
-/*[clinic end generated code: output=9c9967048027c1c7 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=04007a13c8387689 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/_elementtree.c.h b/Modules/clinic/_elementtree.c.h
index 86b4c4cec7..92e98cf0a2 100644
--- a/Modules/clinic/_elementtree.c.h
+++ b/Modules/clinic/_elementtree.c.h
@@ -668,12 +668,13 @@ _elementtree_XMLParser__setevents(XMLParserObject *self, PyObject *args)
     PyObject *events_queue;
     PyObject *events_to_report = Py_None;
 
-    if (!PyArg_ParseTuple(args, "O!|O:_setevents",
-        &PyList_Type, &events_queue, &events_to_report))
+    if (!PyArg_UnpackTuple(args, "_setevents",
+        1, 2,
+        &events_queue, &events_to_report))
         goto exit;
     return_value = _elementtree_XMLParser__setevents_impl(self, events_queue, events_to_report);
 
 exit:
     return return_value;
 }
-/*[clinic end generated code: output=25b8bf7e7f2151ca input=a9049054013a1b77]*/
+/*[clinic end generated code: output=19d94e2d2726d3aa input=a9049054013a1b77]*/
diff --git a/Modules/clinic/binascii.c.h b/Modules/clinic/binascii.c.h
index e348beebaa..46cfb8ec3d 100644
--- a/Modules/clinic/binascii.c.h
+++ b/Modules/clinic/binascii.c.h
@@ -93,26 +93,29 @@ exit:
 }
 
 PyDoc_STRVAR(binascii_b2a_base64__doc__,
-"b2a_base64($module, data, /)\n"
+"b2a_base64($module, /, data, *, newline=True)\n"
 "--\n"
 "\n"
 "Base64-code line of data.");
 
 #define BINASCII_B2A_BASE64_METHODDEF    \
-    {"b2a_base64", (PyCFunction)binascii_b2a_base64, METH_O, binascii_b2a_base64__doc__},
+    {"b2a_base64", (PyCFunction)binascii_b2a_base64, METH_VARARGS|METH_KEYWORDS, binascii_b2a_base64__doc__},
 
 static PyObject *
-binascii_b2a_base64_impl(PyModuleDef *module, Py_buffer *data);
+binascii_b2a_base64_impl(PyModuleDef *module, Py_buffer *data, int newline);
 
 static PyObject *
-binascii_b2a_base64(PyModuleDef *module, PyObject *arg)
+binascii_b2a_base64(PyModuleDef *module, PyObject *args, PyObject *kwargs)
 {
     PyObject *return_value = NULL;
+    static char *_keywords[] = {"data", "newline", NULL};
     Py_buffer data = {NULL, NULL};
+    int newline = 1;
 
-    if (!PyArg_Parse(arg, "y*:b2a_base64", &data))
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "y*|$i:b2a_base64", _keywords,
+        &data, &newline))
         goto exit;
-    return_value = binascii_b2a_base64_impl(module, &data);
+    return_value = binascii_b2a_base64_impl(module, &data, newline);
 
 exit:
     /* Cleanup for data */
@@ -516,4 +519,4 @@ exit:
 
     return return_value;
 }
-/*[clinic end generated code: output=b1a3cbf7660ebaa5 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b15a24350d105251 input=a9049054013a1b77]*/
diff --git a/Modules/clinic/posixmodule.c.h b/Modules/clinic/posixmodule.c.h
index 9ef702a297..a48de6ac88 100644
--- a/Modules/clinic/posixmodule.c.h
+++ b/Modules/clinic/posixmodule.c.h
@@ -2116,7 +2116,7 @@ PyDoc_STRVAR(os_sched_getaffinity__doc__,
 "sched_getaffinity($module, pid, /)\n"
 "--\n"
 "\n"
-"Return the affinity of the process identified by pid.\n"
+"Return the affinity of the process identified by pid (or the current process if zero).\n"
 "\n"
 "The affinity is returned as a set of CPU identifiers.");
 
@@ -5178,7 +5178,11 @@ PyDoc_STRVAR(os_cpu_count__doc__,
 "cpu_count($module, /)\n"
 "--\n"
 "\n"
-"Return the number of CPUs in the system; return None if indeterminable.");
+"Return the number of CPUs in the system; return None if indeterminable.\n"
+"\n"
+"This number is not equivalent to the number of CPUs the current process can\n"
+"use.  The number of usable CPUs can be obtained with\n"
+"``len(os.sched_getaffinity(0))``");
 
 #define OS_CPU_COUNT_METHODDEF    \
     {"cpu_count", (PyCFunction)os_cpu_count, METH_NOARGS, os_cpu_count__doc__},
@@ -5788,4 +5792,4 @@ exit:
 #ifndef OS_SET_HANDLE_INHERITABLE_METHODDEF
     #define OS_SET_HANDLE_INHERITABLE_METHODDEF
 #endif /* !defined(OS_SET_HANDLE_INHERITABLE_METHODDEF) */
-/*[clinic end generated code: output=95824c52fd034654 input=a9049054013a1b77]*/
+/*[clinic end generated code: output=a5c9bef9ad11a20b input=a9049054013a1b77]*/
diff --git a/Modules/clinic/zlibmodule.c.h b/Modules/clinic/zlibmodule.c.h
index 2d75bc912e..222cb6779a 100644
--- a/Modules/clinic/zlibmodule.c.h
+++ b/Modules/clinic/zlibmodule.c.h
@@ -3,38 +3,39 @@ preserve
 [clinic start generated code]*/
 
 PyDoc_STRVAR(zlib_compress__doc__,
-"compress($module, bytes, level=Z_DEFAULT_COMPRESSION, /)\n"
+"compress($module, /, data, level=Z_DEFAULT_COMPRESSION)\n"
 "--\n"
 "\n"
 "Returns a bytes object containing compressed data.\n"
 "\n"
-"  bytes\n"
+"  data\n"
 "    Binary data to be compressed.\n"
 "  level\n"
-"    Compression level, in 0-9.");
+"    Compression level, in 0-9 or -1.");
 
 #define ZLIB_COMPRESS_METHODDEF    \
-    {"compress", (PyCFunction)zlib_compress, METH_VARARGS, zlib_compress__doc__},
+    {"compress", (PyCFunction)zlib_compress, METH_VARARGS|METH_KEYWORDS, zlib_compress__doc__},
 
 static PyObject *
-zlib_compress_impl(PyModuleDef *module, Py_buffer *bytes, int level);
+zlib_compress_impl(PyModuleDef *module, Py_buffer *data, int level);
 
 static PyObject *
-zlib_compress(PyModuleDef *module, PyObject *args)
+zlib_compress(PyModuleDef *module, PyObject *args, PyObject *kwargs)
 {
     PyObject *return_value = NULL;
-    Py_buffer bytes = {NULL, NULL};
+    static char *_keywords[] = {"data", "level", NULL};
+    Py_buffer data = {NULL, NULL};
     int level = Z_DEFAULT_COMPRESSION;
 
-    if (!PyArg_ParseTuple(args, "y*|i:compress",
-        &bytes, &level))
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "y*|i:compress", _keywords,
+        &data, &level))
         goto exit;
-    return_value = zlib_compress_impl(module, &bytes, level);
+    return_value = zlib_compress_impl(module, &data, level);
 
 exit:
-    /* Cleanup for bytes */
-    if (bytes.obj)
-       PyBuffer_Release(&bytes);
+    /* Cleanup for data */
+    if (data.obj)
+       PyBuffer_Release(&data);
 
     return return_value;
 }
@@ -439,4 +440,4 @@ exit:
 #ifndef ZLIB_COMPRESS_COPY_METHODDEF
     #define ZLIB_COMPRESS_COPY_METHODDEF
 #endif /* !defined(ZLIB_COMPRESS_COPY_METHODDEF) */
-/*[clinic end generated code: output=cf81e1deae3af0ce input=a9049054013a1b77]*/
+/*[clinic end generated code: output=e6f3b79e051ecc35 input=a9049054013a1b77]*/