From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 14 Apr 2016 09:30:54 +0000 (+0300)
Subject: Issues #26716, #26057: Regenerate Argument Clinic code.
X-Git-Tag: v3.6.0a1~215
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2eb6b0d1bd71c27c76d578079e21c27ad3338b90;p=thirdparty%2FPython%2Fcpython.git

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

2eb6b0d1bd71c27c76d578079e21c27ad3338b90
diff --cc Modules/_codecsmodule.c
index 1951da96246e,7575773f455a..611ca82cac86
--- a/Modules/_codecsmodule.c
+++ b/Modules/_codecsmodule.c
@@@ -722,10 -726,19 +722,10 @@@ _codecs.utf_7_encod
  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]*/
  {
 -    PyObject *v;
 -
 -    str = PyUnicode_FromObject(str);
 -    if (str == NULL || PyUnicode_READY(str) < 0) {
 -        Py_XDECREF(str);
 -        return NULL;
 -    }
 -    v = codec_tuple(_PyUnicode_EncodeUTF7(str, 0, 0, errors),
 -                    PyUnicode_GET_LENGTH(str));
 -    Py_DECREF(str);
 -    return v;
 +    return codec_tuple(_PyUnicode_EncodeUTF7(str, 0, 0, errors),
 +                       PyUnicode_GET_LENGTH(str));
  }
  
  /*[clinic input]
@@@ -738,10 -751,19 +738,10 @@@ _codecs.utf_8_encod
  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]*/
  {
 -    PyObject *v;
 -
 -    str = PyUnicode_FromObject(str);
 -    if (str == NULL || PyUnicode_READY(str) < 0) {
 -        Py_XDECREF(str);
 -        return NULL;
 -    }
 -    v = codec_tuple(PyUnicode_AsEncodedString(str, "utf-8", errors),
 -                    PyUnicode_GET_LENGTH(str));
 -    Py_DECREF(str);
 -    return v;
 +    return codec_tuple(_PyUnicode_AsUTF8String(str, errors),
 +                       PyUnicode_GET_LENGTH(str));
  }
  
  /* This version provides access to the byteorder parameter of the
@@@ -762,10 -784,19 +762,10 @@@ _codecs.utf_16_encod
  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]*/
  {
 -    PyObject *v;
 -
 -    str = PyUnicode_FromObject(str);
 -    if (str == NULL || PyUnicode_READY(str) < 0) {
 -        Py_XDECREF(str);
 -        return NULL;
 -    }
 -    v = codec_tuple(_PyUnicode_EncodeUTF16(str, errors, byteorder),
 -                    PyUnicode_GET_LENGTH(str));
 -    Py_DECREF(str);
 -    return v;
 +    return codec_tuple(_PyUnicode_EncodeUTF16(str, errors, byteorder),
 +                       PyUnicode_GET_LENGTH(str));
  }
  
  /*[clinic input]
@@@ -778,10 -809,19 +778,10 @@@ _codecs.utf_16_le_encod
  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]*/
  {
 -    PyObject *v;
 -
 -    str = PyUnicode_FromObject(str);
 -    if (str == NULL || PyUnicode_READY(str) < 0) {
 -        Py_XDECREF(str);
 -        return NULL;
 -    }
 -    v = codec_tuple(_PyUnicode_EncodeUTF16(str, errors, -1),
 -                    PyUnicode_GET_LENGTH(str));
 -    Py_DECREF(str);
 -    return v;
 +    return codec_tuple(_PyUnicode_EncodeUTF16(str, errors, -1),
 +                       PyUnicode_GET_LENGTH(str));
  }
  
  /*[clinic input]
@@@ -794,10 -834,19 +794,10 @@@ _codecs.utf_16_be_encod
  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]*/
  {
 -    PyObject *v;
 -
 -    str = PyUnicode_FromObject(str);
 -    if (str == NULL || PyUnicode_READY(str) < 0) {
 -        Py_XDECREF(str);
 -        return NULL;
 -    }
 -    v = codec_tuple(_PyUnicode_EncodeUTF16(str, errors, +1),
 -                    PyUnicode_GET_LENGTH(str));
 -    Py_DECREF(str);
 -    return v;
 +    return codec_tuple(_PyUnicode_EncodeUTF16(str, errors, +1),
 +                       PyUnicode_GET_LENGTH(str));
  }
  
  /* This version provides access to the byteorder parameter of the
@@@ -818,10 -867,19 +818,10 @@@ _codecs.utf_32_encod
  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]*/
  {
 -    PyObject *v;
 -
 -    str = PyUnicode_FromObject(str);
 -    if (str == NULL || PyUnicode_READY(str) < 0) {
 -        Py_XDECREF(str);
 -        return NULL;
 -    }
 -    v = codec_tuple(_PyUnicode_EncodeUTF32(str, errors, byteorder),
 -                    PyUnicode_GET_LENGTH(str));
 -    Py_DECREF(str);
 -    return v;
 +    return codec_tuple(_PyUnicode_EncodeUTF32(str, errors, byteorder),
 +                       PyUnicode_GET_LENGTH(str));
  }
  
  /*[clinic input]
@@@ -834,10 -892,19 +834,10 @@@ _codecs.utf_32_le_encod
  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]*/
  {
 -    PyObject *v;
 -
 -    str = PyUnicode_FromObject(str);
 -    if (str == NULL || PyUnicode_READY(str) < 0) {
 -        Py_XDECREF(str);
 -        return NULL;
 -    }
 -    v = codec_tuple(_PyUnicode_EncodeUTF32(str, errors, -1),
 -                    PyUnicode_GET_LENGTH(str));
 -    Py_DECREF(str);
 -    return v;
 +    return codec_tuple(_PyUnicode_EncodeUTF32(str, errors, -1),
 +                       PyUnicode_GET_LENGTH(str));
  }
  
  /*[clinic input]
@@@ -850,10 -917,19 +850,10 @@@ _codecs.utf_32_be_encod
  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]*/
  {
 -    PyObject *v;
 -
 -    str = PyUnicode_FromObject(str);
 -    if (str == NULL || PyUnicode_READY(str) < 0) {
 -        Py_XDECREF(str);
 -        return NULL;
 -    }
 -    v = codec_tuple(_PyUnicode_EncodeUTF32(str, errors, +1),
 -                    PyUnicode_GET_LENGTH(str));
 -    Py_DECREF(str);
 -    return v;
 +    return codec_tuple(_PyUnicode_EncodeUTF32(str, errors, +1),
 +                       PyUnicode_GET_LENGTH(str));
  }
  
  /*[clinic input]
@@@ -866,10 -942,19 +866,10 @@@ _codecs.unicode_escape_encod
  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]*/
  {
 -    PyObject *v;
 -
 -    str = PyUnicode_FromObject(str);
 -    if (str == NULL || PyUnicode_READY(str) < 0) {
 -        Py_XDECREF(str);
 -        return NULL;
 -    }
 -    v = codec_tuple(PyUnicode_AsUnicodeEscapeString(str),
 -                    PyUnicode_GET_LENGTH(str));
 -    Py_DECREF(str);
 -    return v;
 +    return codec_tuple(PyUnicode_AsUnicodeEscapeString(str),
 +                       PyUnicode_GET_LENGTH(str));
  }
  
  /*[clinic input]
@@@ -882,10 -967,19 +882,10 @@@ _codecs.raw_unicode_escape_encod
  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]*/
  {
 -    PyObject *v;
 -
 -    str = PyUnicode_FromObject(str);
 -    if (str == NULL || PyUnicode_READY(str) < 0) {
 -        Py_XDECREF(str);
 -        return NULL;
 -    }
 -    v = codec_tuple(PyUnicode_AsRawUnicodeEscapeString(str),
 -                    PyUnicode_GET_LENGTH(str));
 -    Py_DECREF(str);
 -    return v;
 +    return codec_tuple(PyUnicode_AsRawUnicodeEscapeString(str),
 +                       PyUnicode_GET_LENGTH(str));
  }
  
  /*[clinic input]
@@@ -898,10 -992,19 +898,10 @@@ _codecs.latin_1_encod
  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]*/
  {
 -    PyObject *v;
 -
 -    str = PyUnicode_FromObject(str);
 -    if (str == NULL || PyUnicode_READY(str) < 0) {
 -        Py_XDECREF(str);
 -        return NULL;
 -    }
 -    v = codec_tuple(_PyUnicode_AsLatin1String(str, errors),
 -                    PyUnicode_GET_LENGTH(str));
 -    Py_DECREF(str);
 -    return v;
 +    return codec_tuple(_PyUnicode_AsLatin1String(str, errors),
 +                       PyUnicode_GET_LENGTH(str));
  }
  
  /*[clinic input]
@@@ -914,10 -1017,19 +914,10 @@@ _codecs.ascii_encod
  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]*/
  {
 -    PyObject *v;
 -
 -    str = PyUnicode_FromObject(str);
 -    if (str == NULL || PyUnicode_READY(str) < 0) {
 -        Py_XDECREF(str);
 -        return NULL;
 -    }
 -    v = codec_tuple(_PyUnicode_AsASCIIString(str, errors),
 -                    PyUnicode_GET_LENGTH(str));
 -    Py_DECREF(str);
 -    return v;
 +    return codec_tuple(_PyUnicode_AsASCIIString(str, errors),
 +                       PyUnicode_GET_LENGTH(str));
  }
  
  /*[clinic input]
@@@ -931,8 -1043,10 +931,8 @@@ _codecs.charmap_encod
  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]*/
  {
 -    PyObject *v;
 -
      if (mapping == Py_None)
          mapping = NULL;
  
@@@ -965,10 -1086,19 +965,10 @@@ _codecs.mbcs_encod
  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]*/
  {
 -    PyObject *v;
 -
 -    str = PyUnicode_FromObject(str);
 -    if (str == NULL || PyUnicode_READY(str) < 0) {
 -        Py_XDECREF(str);
 -        return NULL;
 -    }
 -    v = codec_tuple(PyUnicode_EncodeCodePage(CP_ACP, str, errors),
 -                    PyUnicode_GET_LENGTH(str));
 -    Py_DECREF(str);
 -    return v;
 +    return codec_tuple(PyUnicode_EncodeCodePage(CP_ACP, str, errors),
 +                       PyUnicode_GET_LENGTH(str));
  }
  
  /*[clinic input]
@@@ -982,10 -1112,21 +982,10 @@@ _codecs.code_page_encod
  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]*/
  {
 -    PyObject *v;
 -
 -    str = PyUnicode_FromObject(str);
 -    if (str == NULL || PyUnicode_READY(str) < 0) {
 -        Py_XDECREF(str);
 -        return NULL;
 -    }
 -    v = codec_tuple(PyUnicode_EncodeCodePage(code_page,
 -                                             str,
 -                                             errors),
 -                    PyUnicode_GET_LENGTH(str));
 -    Py_DECREF(str);
 -    return v;
 +    return codec_tuple(PyUnicode_EncodeCodePage(code_page, str, errors),
 +                       PyUnicode_GET_LENGTH(str));
  }
  
  #endif /* HAVE_MBCS */
diff --cc Modules/clinic/_codecsmodule.c.h
index e94be1176e9e,e94be1176e9e..29f46bbb048b
--- a/Modules/clinic/_codecsmodule.c.h
+++ b/Modules/clinic/_codecsmodule.c.h
@@@ -878,7 -878,7 +878,7 @@@ _codecs_utf_7_encode(PyModuleDef *modul
      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 +906,7 @@@ _codecs_utf_8_encode(PyModuleDef *modul
      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 +935,7 @@@ _codecs_utf_16_encode(PyModuleDef *modu
      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 +963,7 @@@ _codecs_utf_16_le_encode(PyModuleDef *m
      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 +991,7 @@@ _codecs_utf_16_be_encode(PyModuleDef *m
      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 +1020,7 @@@ _codecs_utf_32_encode(PyModuleDef *modu
      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 +1048,7 @@@ _codecs_utf_32_le_encode(PyModuleDef *m
      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 +1076,7 @@@ _codecs_utf_32_be_encode(PyModuleDef *m
      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 +1104,7 @@@ _codecs_unicode_escape_encode(PyModuleD
      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 +1132,7 @@@ _codecs_raw_unicode_escape_encode(PyMod
      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 +1160,7 @@@ _codecs_latin_1_encode(PyModuleDef *mod
      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 +1188,7 @@@ _codecs_ascii_encode(PyModuleDef *modul
      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 +1217,7 @@@ _codecs_charmap_encode(PyModuleDef *mod
      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 +1272,7 @@@ _codecs_mbcs_encode(PyModuleDef *module
      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 +1305,7 @@@ _codecs_code_page_encode(PyModuleDef *m
      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 +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]*/