diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-09-22 08:25:22 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-09-22 08:25:22 (GMT) |
commit | fb436c4ebaff171cfff789e702dbc6b5a00281cf (patch) | |
tree | c3365f44a16771bab35c069217b6e5b9153cdc09 /Doc/howto | |
parent | a867ed553e3c459dadf3e393490cfa587177ea07 (diff) | |
parent | b1d0e5b11eac1ed5ae3d41bf952a3f68ad35f668 (diff) | |
download | cpython-fb436c4ebaff171cfff789e702dbc6b5a00281cf.zip cpython-fb436c4ebaff171cfff789e702dbc6b5a00281cf.tar.gz cpython-fb436c4ebaff171cfff789e702dbc6b5a00281cf.tar.bz2 |
#15949, 15899: merge with 3.2.
Diffstat (limited to 'Doc/howto')
-rw-r--r-- | Doc/howto/unicode.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst index bcd29be..ea83d29 100644 --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@ -262,8 +262,8 @@ Unicode result). The following examples show the differences:: ... UnicodeDecodeError: 'utf-8' codec can't decode byte 0x80 in position 0: invalid start byte - >>> b'\x80abc'.decode("utf-8", "replace") - '�abc' + >>> b'\x80abc'.decode("utf-8", "replace") #doctest: +SKIP + '?abc' >>> b'\x80abc'.decode("utf-8", "ignore") 'abc' |