summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-03-18 12:58:49 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-03-18 12:58:49 (GMT)
commit6a318d420a1512f632aa7e21a1956cfeb38b682d (patch)
tree6e6a5ad8db5cac538c1fa20725de2a975b9c670b /Doc
parentd6dc7bdaf92915fa47caa47f35ca3cb4505f9f34 (diff)
downloadcpython-6a318d420a1512f632aa7e21a1956cfeb38b682d.zip
cpython-6a318d420a1512f632aa7e21a1956cfeb38b682d.tar.gz
cpython-6a318d420a1512f632aa7e21a1956cfeb38b682d.tar.bz2
Issue #19428: Document that PyMarshal_ReadLongFromFile() and
PyMarshal_ReadShortFromFile() can fail.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/c-api/marshal.rst21
1 files changed, 15 insertions, 6 deletions
diff --git a/Doc/c-api/marshal.rst b/Doc/c-api/marshal.rst
index da402a8..9ea0aaa 100644
--- a/Doc/c-api/marshal.rst
+++ b/Doc/c-api/marshal.rst
@@ -53,6 +53,8 @@ written using these routines?
for reading. Only a 32-bit value can be read in using this function,
regardless of the native size of :c:type:`long`.
+ On error, raise an exception and return ``-1``.
+
.. c:function:: int PyMarshal_ReadShortFromFile(FILE *file)
@@ -60,11 +62,15 @@ written using these routines?
for reading. Only a 16-bit value can be read in using this function,
regardless of the native size of :c:type:`short`.
+ On error, raise an exception and return ``-1``.
+
.. c:function:: PyObject* PyMarshal_ReadObjectFromFile(FILE *file)
Return a Python object from the data stream in a :c:type:`FILE\*` opened for
- reading. On error, sets the appropriate exception (:exc:`EOFError` or
+ reading.
+
+ On error, sets the appropriate exception (:exc:`EOFError` or
:exc:`TypeError`) and returns *NULL*.
@@ -76,14 +82,17 @@ written using these routines?
aggressively load file data into memory so that the de-serialization can
operate from data in memory rather than reading a byte at a time from the
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*.
+ anything else from the file.
+
+ On error, sets the appropriate exception (:exc:`EOFError` or
+ :exc:`TypeError`) and returns *NULL*.
.. c:function:: PyObject* PyMarshal_ReadObjectFromString(char *string, Py_ssize_t len)
Return a Python object from the data stream in a character buffer
- containing *len* bytes pointed to by *string*. On error, sets the
- appropriate exception (:exc:`EOFError` or :exc:`TypeError`) and returns
- *NULL*.
+ containing *len* bytes pointed to by *string*.
+
+ On error, sets the appropriate exception (:exc:`EOFError` or
+ :exc:`TypeError`) and returns *NULL*.