diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2015-01-07 13:14:47 +1000 |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2015-01-07 13:14:47 +1000 |
| commit | f212636fe3fd6505e0de2dafbe7d0a7ab27031cd (patch) | |
| tree | b26960aad9fab82b67539731013edaf4b20c6683 /Doc/library/codecs.rst | |
| parent | 582acb75e9a03e21281fe3c3877b6d48a8f0fa8f (diff) | |
| download | cpython-git-f212636fe3fd6505e0de2dafbe7d0a7ab27031cd.tar.gz | |
Issue #19548: clean up merge issues in codecs docs
Patch by Martin Panter to clean up some problems with the merge
of the codecs docs changes from Python 3.4.
Diffstat (limited to 'Doc/library/codecs.rst')
| -rw-r--r-- | Doc/library/codecs.rst | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst index 0227d9b963..b67e653c14 100644 --- a/Doc/library/codecs.rst +++ b/Doc/library/codecs.rst @@ -256,7 +256,6 @@ and writing to platform dependent files: encodings. -.. _surrogateescape: .. _codec-base-classes: Codec Base Classes @@ -273,6 +272,7 @@ implement the file protocols. Codec authors also need to define how the codec will handle encoding and decoding errors. +.. _surrogateescape: .. _error-handlers: Error Handlers @@ -319,7 +319,8 @@ The following error handlers are only applicable to | | :func:`backslashreplace_errors`. | +-------------------------+-----------------------------------------------+ | ``'namereplace'`` | Replace with ``\N{...}`` escape sequences | -| | (only for encoding). | +| | (only for encoding). Implemented in | +| | :func:`namereplace_errors`. | +-------------------------+-----------------------------------------------+ | ``'surrogateescape'`` | On decoding, replace byte with individual | | | surrogate code ranging from ``U+DC80`` to | @@ -422,7 +423,8 @@ functions: .. function:: namereplace_errors(exception) - Implements the ``namereplace`` error handling (for encoding only): the + Implements the ``'namereplace'`` error handling (for encoding with + :term:`text encodings <text encoding>` only): the unencodable character is replaced by a ``\N{...}`` escape sequence. .. versionadded:: 3.5 |