summaryrefslogtreecommitdiffstats
path: root/Doc/library/codecs.rst
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2009-06-29 06:36:33 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2009-06-29 06:36:33 (GMT)
commit6870f26d264d6242b3f61f01e306609b688f9c8f (patch)
tree0b7f9ed9d7656aa0a8dad8712943fc522b3c5465 /Doc/library/codecs.rst
parente65abb3fb04d9e1f273885b3cfa8da46b7f96018 (diff)
downloadcpython-6870f26d264d6242b3f61f01e306609b688f9c8f.zip
cpython-6870f26d264d6242b3f61f01e306609b688f9c8f.tar.gz
cpython-6870f26d264d6242b3f61f01e306609b688f9c8f.tar.bz2
Merged revisions 73673 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r73673 | martin.v.loewis | 2009-06-29 08:35:26 +0200 (Mo, 29 Jun 2009) | 2 lines Link to PEP 383. ........
Diffstat (limited to 'Doc/library/codecs.rst')
-rw-r--r--Doc/library/codecs.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index e3f98ef..53437ce 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -322,7 +322,8 @@ and implemented by all standard Python codecs:
| ``'backslashreplace'`` | Replace with backslashed escape sequences |
| | (only for encoding). |
+-------------------------+-----------------------------------------------+
-| ``'surrogateescape'`` | Replace byte with surrogate U+DCxx. |
+| ``'surrogateescape'`` | Replace byte with surrogate U+DCxx, as defined|
+| | in :pep:`383`. |
+-------------------------+-----------------------------------------------+
In addition, the following error handlers are specific to a single codec: