mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #19548: clean up merge issues in codecs docs

Browse source 
Patch by Martin Panter to clean up some problems with the merge
of the codecs docs changes from Python 3.4.
This commit is contained in:
Nick Coghlan 2015-01-07 13:14:47 +10:00
parent 582acb75e9
commit f212636fe3
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Doc/library/codecs.rst
View file

@ -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