summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAndrew Kuchling <amk@amk.ca>2013-06-16 17:02:55 (GMT)
committerAndrew Kuchling <amk@amk.ca>2013-06-16 17:02:55 (GMT)
commitf567727abcba9d3b56fd2d0254050eff23535d1a (patch)
tree479246982709288ca4e8da7cd7e7718b0c4bd1cc /Lib
parent39295e7a55d03b9ef31c0d0dd27d129b1ad5a695 (diff)
parentc7b6c50f29fac4971e7271ac649ee3b7ef3deac7 (diff)
downloadcpython-f567727abcba9d3b56fd2d0254050eff23535d1a.zip
cpython-f567727abcba9d3b56fd2d0254050eff23535d1a.tar.gz
cpython-f567727abcba9d3b56fd2d0254050eff23535d1a.tar.bz2
Merge with 3.3
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