summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2013-06-16 17:14:06 (GMT)
committerBrett Cannon <brett@python.org>2013-06-16 17:14:06 (GMT)
commit645ab68f25457b24f2dadfa3e6911cebac30d33e (patch)
tree2f319c658d94a9cb74e366b9bb4d66a4e2a1a733 /Lib
parente4f41deccf94ccc798b1eb1f44657ade66669a60 (diff)
parentf567727abcba9d3b56fd2d0254050eff23535d1a (diff)
downloadcpython-645ab68f25457b24f2dadfa3e6911cebac30d33e.zip
cpython-645ab68f25457b24f2dadfa3e6911cebac30d33e.tar.gz
cpython-645ab68f25457b24f2dadfa3e6911cebac30d33e.tar.bz2
merge
Diffstat (limited to 'Lib')
-rw-r--r--Lib/codecs.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/codecs.py b/Lib/codecs.py
index 48d4c9c..6a6eb90 100644
--- a/Lib/codecs.py
+++ b/Lib/codecs.py
@@ -105,6 +105,7 @@ class Codec:
Python will use the official U+FFFD REPLACEMENT
CHARACTER for the builtin Unicode codecs on
decoding and '?' on encoding.
+ 'surrogateescape' - replace with private codepoints U+DCnn.
'xmlcharrefreplace' - Replace with the appropriate XML
character reference (only for encoding).
'backslashreplace' - Replace with backslashed escape sequences