summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-09-16 14:32:06 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-09-16 14:32:06 (GMT)
commit7b4bcd20041d25d5c5b5f416bc6d1090dd3e374a (patch)
treea840f7f6ce44a552b1e4b066ae79664e6d521e6d /Doc
parentde3f48ae9a5c807f1af26f2841a39a3667cc9760 (diff)
parent4a72a7b6c4c95f7613486f0e4e20a3d4815a16c5 (diff)
downloadcpython-7b4bcd20041d25d5c5b5f416bc6d1090dd3e374a.zip
cpython-7b4bcd20041d25d5c5b5f416bc6d1090dd3e374a.tar.gz
cpython-7b4bcd20041d25d5c5b5f416bc6d1090dd3e374a.tar.bz2
Issue #25270: Merge from 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/c-api/bytes.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/c-api/bytes.rst b/Doc/c-api/bytes.rst
index dcd7088..ee42f85 100644
--- a/Doc/c-api/bytes.rst
+++ b/Doc/c-api/bytes.rst
@@ -198,5 +198,5 @@ called with a non-bytes parameter.
desired. On success, *\*bytes* holds the resized bytes object and ``0`` is
returned; the address in *\*bytes* may differ from its input value. If the
reallocation fails, the original bytes object at *\*bytes* is deallocated,
- *\*bytes* is set to *NULL*, a memory exception is set, and ``-1`` is
+ *\*bytes* is set to *NULL*, :exc:`MemoryError` is set, and ``-1`` is
returned.