summaryrefslogtreecommitdiffstats
path: root/Doc/c-api
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2017-03-12 06:53:22 (GMT)
committerGitHub <noreply@github.com>2017-03-12 06:53:22 (GMT)
commitc611a5b1d4fab0123bf622f06c3bfa510221dc32 (patch)
treefcdc7f1ece4dff3acdebd3cb16458c64c2ff847f /Doc/c-api
parent93710c152e6bcfffdf2f1f15bb5f75b013aef422 (diff)
downloadcpython-c611a5b1d4fab0123bf622f06c3bfa510221dc32.zip
cpython-c611a5b1d4fab0123bf622f06c3bfa510221dc32.tar.gz
cpython-c611a5b1d4fab0123bf622f06c3bfa510221dc32.tar.bz2
bpo-29746: Update marshal docs to Python 3. (#547)
Diffstat (limited to 'Doc/c-api')
-rw-r--r--Doc/c-api/marshal.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/c-api/marshal.rst b/Doc/c-api/marshal.rst
index a6d0f46..c6d1d02 100644
--- a/Doc/c-api/marshal.rst
+++ b/Doc/c-api/marshal.rst
@@ -34,7 +34,7 @@ unmarshalling. Version 2 uses a binary format for floating point numbers.
.. c:function:: PyObject* PyMarshal_WriteObjectToString(PyObject *value, int version)
- Return a string object containing the marshalled representation of *value*.
+ Return a bytes object containing the marshalled representation of *value*.
*version* indicates the file format.
@@ -88,10 +88,10 @@ written using these routines?
:exc:`TypeError`) and returns *NULL*.
-.. c:function:: PyObject* PyMarshal_ReadObjectFromString(const char *string, Py_ssize_t len)
+.. c:function:: PyObject* PyMarshal_ReadObjectFromString(const char *data, Py_ssize_t len)
- Return a Python object from the data stream in a character buffer
- containing *len* bytes pointed to by *string*.
+ Return a Python object from the data stream in a byte buffer
+ containing *len* bytes pointed to by *data*.
On error, sets the appropriate exception (:exc:`EOFError` or
:exc:`TypeError`) and returns *NULL*.