summaryrefslogtreecommitdiffstats
path: root/Doc/c-api
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-10-08 19:46:01 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2016-10-08 19:46:01 (GMT)
commit21d9f10c9442ba646340913beba8cf73cc77c885 (patch)
tree177253021450ca18b21878fc16704420c93433ce /Doc/c-api
parentc6f9b2b7f5f3640ce8aeac4aff67f75821891d81 (diff)
parent9c0e1f83af433a9eebb70cd41adcff2b0d608e05 (diff)
downloadcpython-21d9f10c9442ba646340913beba8cf73cc77c885.zip
cpython-21d9f10c9442ba646340913beba8cf73cc77c885.tar.gz
cpython-21d9f10c9442ba646340913beba8cf73cc77c885.tar.bz2
Merge from 3.5.
Diffstat (limited to 'Doc/c-api')
-rw-r--r--Doc/c-api/unicode.rst9
1 files changed, 6 insertions, 3 deletions
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
index d1015dd..b91dbf2 100644
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -572,13 +572,16 @@ APIs:
.. versionadded:: 3.3
-.. c:function:: int PyUnicode_CopyCharacters(PyObject *to, Py_ssize_t to_start, \
- PyObject *from, Py_ssize_t from_start, Py_ssize_t how_many)
+.. c:function:: Py_ssize_t PyUnicode_CopyCharacters(PyObject *to, \
+ Py_ssize_t to_start, \
+ PyObject *from, \
+ Py_ssize_t from_start, \
+ Py_ssize_t how_many)
Copy characters from one Unicode object into another. This function performs
character conversion when necessary and falls back to :c:func:`memcpy` if
possible. Returns ``-1`` and sets an exception on error, otherwise returns
- ``0``.
+ the number of copied characters.
.. versionadded:: 3.3