mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-05 22:51:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-29746: Update marshal docs to Python 3. (#547) (#630)

Browse source 
(cherry picked from commit c611a5b1d4)
This commit is contained in:
Serhiy Storchaka 2017-03-12 10:05:27 +02:00 • committed by GitHub
parent be31a83730
commit f12f820ef8
4 changed files with 31 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Doc/c-api/marshal.rst
View file

@ -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*.