Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpo-12743: Delete obsolete comment from marshalling docs #8457

Merged
merged 5 commits into from
Jul 27, 2018
Merged

bpo-12743: Delete obsolete comment from marshalling docs #8457

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b02d6ff
bpo-12743: Delete obsolete comment from marshalling docs
berkerpeksag Jul 25, 2018
f170eff
address review comments
berkerpeksag Jul 25, 2018
9bf1c72
address another review comment
berkerpeksag Jul 25, 2018
892f152
address another comment
berkerpeksag Jul 26, 2018
70bf977
document ValueError in remaining functions
berkerpeksag Jul 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
document ValueError in remaining functions
  • Loading branch information
@berkerpeksag
berkerpeksag committed Jul 26, 2018
commit 70bf977328da141267b238602dcf6ee44db8a41a
8 changes: 4 additions & 4 deletions Doc/c-api/marshal.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ The following functions allow marshalled values to be read back in.
file. Only use these variant if you are certain that you won't be reading
anything else from the file.

On error, sets the appropriate exception (:exc:`EOFError` or
:exc:`TypeError`) and returns *NULL*.
On error, sets the appropriate exception (:exc:`EOFError`, :exc:`ValueError`
or :exc:`TypeError`) and returns *NULL*.


.. c:function:: PyObject* PyMarshal_ReadObjectFromString(const char *data, Py_ssize_t len)

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*.
On error, sets the appropriate exception (:exc:`EOFError`, :exc:`ValueError`
or :exc:`TypeError`) and returns *NULL*.