summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2016-10-16 21:46:37 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2016-10-16 21:46:37 (GMT)
commitb8bddec4e0bb222cd60b76ad48c19e3aa5c19841 (patch)
tree5eabf40341ba4cbab55f8d645e131766c44a4ce7 /Doc
parentbf7dcb9cd0a1299af0565a91c5c95978d72c8d3e (diff)
parent90e028970a3217bfbd92c3db8591ce2b0c307c14 (diff)
downloadcpython-b8bddec4e0bb222cd60b76ad48c19e3aa5c19841.zip
cpython-b8bddec4e0bb222cd60b76ad48c19e3aa5c19841.tar.gz
cpython-b8bddec4e0bb222cd60b76ad48c19e3aa5c19841.tar.bz2
Issue #28432: Merge from 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/c-api/unicode.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
index b91dbf2..ab0271c 100644
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -787,7 +787,7 @@ system.
Encode a Unicode object to the current locale encoding. The
supported error handlers are ``"strict"`` and ``"surrogateescape"``
(:pep:`383`). The encoder uses ``"strict"`` error handler if
- *errors* is ``NULL``. Return a :class:`bytes` object. *str* cannot
+ *errors* is ``NULL``. Return a :class:`bytes` object. *unicode* cannot
contain embedded null characters.
Use :c:func:`PyUnicode_EncodeFSDefault` to encode a string to