diff options
author | Martin Panter <vadmium+py@gmail.com> | 2017-01-29 10:16:28 +0000 |
---|---|---|
committer | Martin Panter <vadmium+py@gmail.com> | 2017-01-29 10:16:28 +0000 |
commit | 23352add84278fc0476b2d6599489fbb70c9f5bc (patch) | |
tree | 600bf5132e46d31b69efbd3bbc8a3d37159c0744 /Doc/c-api/unicode.rst | |
parent | 6d1d733828b49eb03d45da81c6b8c6b849fbc5df (diff) | |
parent | 0fb1e3c9fc84c62a91f1e5889dc8e0855cefa4ae (diff) | |
download | cpython-23352add84278fc0476b2d6599489fbb70c9f5bc.tar.gz |
Issues #29349: Merge Py 2 fix 3.6
Diffstat (limited to 'Doc/c-api/unicode.rst')
-rw-r--r-- | Doc/c-api/unicode.rst | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst index 02f7ada7be..bcae44ef49 100644 --- a/Doc/c-api/unicode.rst +++ b/Doc/c-api/unicode.rst @@ -1038,7 +1038,7 @@ These are the UTF-8 codec APIs: raised by the codec. -.. c:function:: char* PyUnicode_AsUTF8AndSize(PyObject *unicode, Py_ssize_t *size) +.. c:function:: const char* PyUnicode_AsUTF8AndSize(PyObject *unicode, Py_ssize_t *size) Return a pointer to the UTF-8 encoding of the Unicode object, and store the size of the encoded representation (in bytes) in *size*. The @@ -1055,13 +1055,19 @@ These are the UTF-8 codec APIs: .. versionadded:: 3.3 + .. versionchanged:: 3.7 + The return type is now ``const char *`` rather of ``char *``. -.. c:function:: char* PyUnicode_AsUTF8(PyObject *unicode) + +.. c:function:: const char* PyUnicode_AsUTF8(PyObject *unicode) As :c:func:`PyUnicode_AsUTF8AndSize`, but does not store the size. .. versionadded:: 3.3 + .. versionchanged:: 3.7 + The return type is now ``const char *`` rather of ``char *``. + .. c:function:: PyObject* PyUnicode_EncodeUTF8(const Py_UNICODE *s, Py_ssize_t size, const char *errors) @@ -1605,6 +1611,9 @@ They all return *NULL* or ``-1`` if an exception occurs. .. versionadded:: 3.3 + .. versionchanged:: 3.7 + *start* and *end* are now adjusted to behave like ``str[start:end]``. + .. c:function:: Py_ssize_t PyUnicode_Count(PyObject *str, PyObject *substr, \ Py_ssize_t start, Py_ssize_t end) |