summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2023-06-05 15:42:16 (GMT)
committerGitHub <noreply@github.com>2023-06-05 15:42:16 (GMT)
commite1c396d164a7823f2a72feb15335f497d51da563 (patch)
treeb9e294213925b134e406cb980ea1d70b13351236
parente15de14c16ce98e773c31607bd70ee911e4ac073 (diff)
downloadcpython-e1c396d164a7823f2a72feb15335f497d51da563.zip
cpython-e1c396d164a7823f2a72feb15335f497d51da563.tar.gz
cpython-e1c396d164a7823f2a72feb15335f497d51da563.tar.bz2
[3.9] gh-105184: document that marshal functions can fail and need to be checked with PyErr_Occurred (GH-105185) (#105221)
(cherry picked from commit ee26ca13a129da8cf549409d0a1b2e892ff2b4ec) Co-authored-by: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
-rw-r--r--Doc/c-api/marshal.rst4
-rw-r--r--Python/marshal.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/Doc/c-api/marshal.rst b/Doc/c-api/marshal.rst
index 7bb0dad..027ffd5 100644
--- a/Doc/c-api/marshal.rst
+++ b/Doc/c-api/marshal.rst
@@ -25,12 +25,16 @@ unmarshalling. Version 2 uses a binary format for floating point numbers.
the least-significant 32 bits of *value*; regardless of the size of the
native :c:type:`long` type. *version* indicates the file format.
+ This function can fail, in which case it sets the error indicator.
+ Use :c:func:`PyErr_Occurred` to check for that.
.. c:function:: void PyMarshal_WriteObjectToFile(PyObject *value, FILE *file, int version)
Marshal a Python object, *value*, to *file*.
*version* indicates the file format.
+ This function can fail, in which case it sets the error indicator.
+ Use :c:func:`PyErr_Occurred` to check for that.
.. c:function:: PyObject* PyMarshal_WriteObjectToString(PyObject *value, int version)
diff --git a/Python/marshal.c b/Python/marshal.c
index baafa3e..651168d 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -576,6 +576,10 @@ w_clear_refs(WFILE *wf)
}
/* version currently has no effect for writing ints. */
+/* Note that while the documentation states that this function
+ * can error, currently it never does. Setting an exception in
+ * this function should be regarded as an API-breaking change.
+ */
void
PyMarshal_WriteLongToFile(long x, FILE *fp, int version)
{