[Python-checkins] cpython (merge 3.5 -> default): Issues #26716, #26057: Regenerate Argument Clinic code.
serhiy.storchaka
python-checkins at python.org
Thu Apr 14 05:40:38 EDT 2016
https://hg.python.org/cpython/rev/19dec08e54a8
changeset: 100966:19dec08e54a8
parent: 100964:2fc61f8ee2d2
parent: 100965:9ffe055f2b0e
user: Serhiy Storchaka <storchaka at gmail.com>
date: Thu Apr 14 12:30:54 2016 +0300
summary:
Issues #26716, #26057: Regenerate Argument Clinic code.
files:
Modules/_codecsmodule.c | 30 +++++++++---------
Modules/clinic/_codecsmodule.c.h | 32 ++++++++++----------
Modules/clinic/fcntlmodule.c.h | 4 +-
Modules/fcntlmodule.c | 2 +-
4 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/Modules/_codecsmodule.c b/Modules/_codecsmodule.c
--- a/Modules/_codecsmodule.c
+++ b/Modules/_codecsmodule.c
@@ -722,7 +722,7 @@
static PyObject *
_codecs_utf_7_encode_impl(PyModuleDef *module, PyObject *str,
const char *errors)
-/*[clinic end generated code: output=a7accc496a32b759 input=fd91a78f103b0421]*/
+/*[clinic end generated code: output=a7accc496a32b759 input=d1a47579e79cbe15]*/
{
return codec_tuple(_PyUnicode_EncodeUTF7(str, 0, 0, errors),
PyUnicode_GET_LENGTH(str));
@@ -738,7 +738,7 @@
static PyObject *
_codecs_utf_8_encode_impl(PyModuleDef *module, PyObject *str,
const char *errors)
-/*[clinic end generated code: output=ec831d80e7aedede input=2c22d40532f071f3]*/
+/*[clinic end generated code: output=ec831d80e7aedede input=42e3ba73c4392eef]*/
{
return codec_tuple(_PyUnicode_AsUTF8String(str, errors),
PyUnicode_GET_LENGTH(str));
@@ -762,7 +762,7 @@
static PyObject *
_codecs_utf_16_encode_impl(PyModuleDef *module, PyObject *str,
const char *errors, int byteorder)
-/*[clinic end generated code: output=93ac58e960a9ee4d input=3935a489b2d5385e]*/
+/*[clinic end generated code: output=93ac58e960a9ee4d input=ff46416b04edb944]*/
{
return codec_tuple(_PyUnicode_EncodeUTF16(str, errors, byteorder),
PyUnicode_GET_LENGTH(str));
@@ -778,7 +778,7 @@
static PyObject *
_codecs_utf_16_le_encode_impl(PyModuleDef *module, PyObject *str,
const char *errors)
-/*[clinic end generated code: output=422bedb8da34fb66 input=bc27df05d1d20dfe]*/
+/*[clinic end generated code: output=422bedb8da34fb66 input=cb385455ea8f2fe0]*/
{
return codec_tuple(_PyUnicode_EncodeUTF16(str, errors, -1),
PyUnicode_GET_LENGTH(str));
@@ -794,7 +794,7 @@
static PyObject *
_codecs_utf_16_be_encode_impl(PyModuleDef *module, PyObject *str,
const char *errors)
-/*[clinic end generated code: output=3aa7ee9502acdd77 input=5a69d4112763462b]*/
+/*[clinic end generated code: output=3aa7ee9502acdd77 input=9119997066bdaefd]*/
{
return codec_tuple(_PyUnicode_EncodeUTF16(str, errors, +1),
PyUnicode_GET_LENGTH(str));
@@ -818,7 +818,7 @@
static PyObject *
_codecs_utf_32_encode_impl(PyModuleDef *module, PyObject *str,
const char *errors, int byteorder)
-/*[clinic end generated code: output=3e7d5a003b02baed input=434a1efa492b8d58]*/
+/*[clinic end generated code: output=3e7d5a003b02baed input=c5e77da82fbe5c2a]*/
{
return codec_tuple(_PyUnicode_EncodeUTF32(str, errors, byteorder),
PyUnicode_GET_LENGTH(str));
@@ -834,7 +834,7 @@
static PyObject *
_codecs_utf_32_le_encode_impl(PyModuleDef *module, PyObject *str,
const char *errors)
-/*[clinic end generated code: output=5dda641cd33dbfc2 input=dfa2d7dc78b99422]*/
+/*[clinic end generated code: output=5dda641cd33dbfc2 input=9993b25fe0877848]*/
{
return codec_tuple(_PyUnicode_EncodeUTF32(str, errors, -1),
PyUnicode_GET_LENGTH(str));
@@ -850,7 +850,7 @@
static PyObject *
_codecs_utf_32_be_encode_impl(PyModuleDef *module, PyObject *str,
const char *errors)
-/*[clinic end generated code: output=ccca8b44d91a7c7a input=4595617b18169002]*/
+/*[clinic end generated code: output=ccca8b44d91a7c7a input=d3e0ccaa02920431]*/
{
return codec_tuple(_PyUnicode_EncodeUTF32(str, errors, +1),
PyUnicode_GET_LENGTH(str));
@@ -866,7 +866,7 @@
static PyObject *
_codecs_unicode_escape_encode_impl(PyModuleDef *module, PyObject *str,
const char *errors)
-/*[clinic end generated code: output=389f23d2b8f8d80b input=8273506f14076912]*/
+/*[clinic end generated code: output=389f23d2b8f8d80b input=65d9eefca65b455a]*/
{
return codec_tuple(PyUnicode_AsUnicodeEscapeString(str),
PyUnicode_GET_LENGTH(str));
@@ -882,7 +882,7 @@
static PyObject *
_codecs_raw_unicode_escape_encode_impl(PyModuleDef *module, PyObject *str,
const char *errors)
-/*[clinic end generated code: output=fec4e39d6ec37a62 input=181755d5dfacef3c]*/
+/*[clinic end generated code: output=fec4e39d6ec37a62 input=5aa33e4a133391ab]*/
{
return codec_tuple(PyUnicode_AsRawUnicodeEscapeString(str),
PyUnicode_GET_LENGTH(str));
@@ -898,7 +898,7 @@
static PyObject *
_codecs_latin_1_encode_impl(PyModuleDef *module, PyObject *str,
const char *errors)
-/*[clinic end generated code: output=ecf00eb8e48c889c input=f03f6dcf1d84bee4]*/
+/*[clinic end generated code: output=ecf00eb8e48c889c input=30b11c9e49a65150]*/
{
return codec_tuple(_PyUnicode_AsLatin1String(str, errors),
PyUnicode_GET_LENGTH(str));
@@ -914,7 +914,7 @@
static PyObject *
_codecs_ascii_encode_impl(PyModuleDef *module, PyObject *str,
const char *errors)
-/*[clinic end generated code: output=a9d18fc6b6b91cfb input=d87e25a10a593fee]*/
+/*[clinic end generated code: output=a9d18fc6b6b91cfb input=843a1d268e6dfa8e]*/
{
return codec_tuple(_PyUnicode_AsASCIIString(str, errors),
PyUnicode_GET_LENGTH(str));
@@ -931,7 +931,7 @@
static PyObject *
_codecs_charmap_encode_impl(PyModuleDef *module, PyObject *str,
const char *errors, PyObject *mapping)
-/*[clinic end generated code: output=14ca42b83853c643 input=85f4172661e8dad9]*/
+/*[clinic end generated code: output=14ca42b83853c643 input=0752cde07a6d6d00]*/
{
if (mapping == Py_None)
mapping = NULL;
@@ -965,7 +965,7 @@
static PyObject *
_codecs_mbcs_encode_impl(PyModuleDef *module, PyObject *str,
const char *errors)
-/*[clinic end generated code: output=d1a013bc68798bd7 input=65c09ee1e4203263]*/
+/*[clinic end generated code: output=d1a013bc68798bd7 input=de471e0815947553]*/
{
return codec_tuple(PyUnicode_EncodeCodePage(CP_ACP, str, errors),
PyUnicode_GET_LENGTH(str));
@@ -982,7 +982,7 @@
static PyObject *
_codecs_code_page_encode_impl(PyModuleDef *module, int code_page,
PyObject *str, const char *errors)
-/*[clinic end generated code: output=3b406618dbfbce25 input=c8562ec460c2e309]*/
+/*[clinic end generated code: output=3b406618dbfbce25 input=786421ae617d680b]*/
{
return codec_tuple(PyUnicode_EncodeCodePage(code_page, str, errors),
PyUnicode_GET_LENGTH(str));
diff --git a/Modules/clinic/_codecsmodule.c.h b/Modules/clinic/_codecsmodule.c.h
--- a/Modules/clinic/_codecsmodule.c.h
+++ b/Modules/clinic/_codecsmodule.c.h
@@ -878,7 +878,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
#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/fcntlmodule.c.h b/Modules/clinic/fcntlmodule.c.h
--- a/Modules/clinic/fcntlmodule.c.h
+++ b/Modules/clinic/fcntlmodule.c.h
@@ -145,7 +145,7 @@
"\n"
"When operation is LOCK_SH or LOCK_EX, it can also be bitwise ORed with\n"
"LOCK_NB to avoid blocking on lock acquisition. If LOCK_NB is used and the\n"
-"lock cannot be acquired, an IOError will be raised and the exception will\n"
+"lock cannot be acquired, an OSError will be raised and the exception will\n"
"have an errno attribute set to EACCES or EAGAIN (depending on the operating\n"
"system -- for portability, check for either value).\n"
"\n"
@@ -182,4 +182,4 @@
exit:
return return_value;
}
-/*[clinic end generated code: output=92963b631d00f0fe input=a9049054013a1b77]*/
+/*[clinic end generated code: output=b7d6e8fc2ad09c48 input=a9049054013a1b77]*/
diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c
--- a/Modules/fcntlmodule.c
+++ b/Modules/fcntlmodule.c
@@ -360,7 +360,7 @@
static PyObject *
fcntl_lockf_impl(PyModuleDef *module, int fd, int code, PyObject *lenobj,
PyObject *startobj, int whence)
-/*[clinic end generated code: output=31af35eba08b9af7 input=9c594391de821f24]*/
+/*[clinic end generated code: output=31af35eba08b9af7 input=3a5dc01b04371f1a]*/
{
int ret;
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list