summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-11-29 13:23:46 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-11-29 13:23:46 (GMT)
commit1d1210ec3b28827150d081d00ae7c545a2cef8c0 (patch)
tree978b1ed98275e2c508bb5641f57c01cf2df6dcd1 /Doc
parent7030dd8500dc7c040878d7c089e43a4dad62d393 (diff)
parentf4c3a187d50ca4f625bb3edd97c8998d4230205c (diff)
downloadcpython-1d1210ec3b28827150d081d00ae7c545a2cef8c0.zip
cpython-1d1210ec3b28827150d081d00ae7c545a2cef8c0.tar.gz
cpython-1d1210ec3b28827150d081d00ae7c545a2cef8c0.tar.bz2
Merge: remove redundant sentence from c-api docs (issue #16323)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/c-api/unicode.rst5
1 files changed, 1 insertions, 4 deletions
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
index ea635b1..89bd148 100644
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -742,10 +742,7 @@ system.
Decode a string from the current locale encoding. The supported
error handlers are ``"strict"`` and ``"surrogateescape"``
(:pep:`383`). The decoder uses ``"strict"`` error handler if
- *errors* is ``NULL``. If a byte sequence can be decoded as a
- surrogate character and *errors* is not ``"strict"``, then the byte
- sequence is escaped using the ``"surrogateescape"`` error handler
- instead of being decoded. *str* must end with a null character but
+ *errors* is ``NULL``. *str* must end with a null character but
cannot contain embedded null characters.
.. seealso::