diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-09-23 13:03:21 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-09-23 13:03:21 (GMT) |
| commit | 2b7a71d6e592dcc8257b1007fffd2fdd3cd193af (patch) | |
| tree | 71eff9543c9a6414d54780eff8ceb6e8d2a4f004 /Doc | |
| parent | 707bce4a66bbe34fc346775543876161379cfb3e (diff) | |
| parent | 20b8d992b008672d52a84c8d35992033ccfc9d84 (diff) | |
| download | cpython-2b7a71d6e592dcc8257b1007fffd2fdd3cd193af.zip cpython-2b7a71d6e592dcc8257b1007fffd2fdd3cd193af.tar.gz cpython-2b7a71d6e592dcc8257b1007fffd2fdd3cd193af.tar.bz2 | |
#15949, #15899: merge with 3.2.
Diffstat (limited to 'Doc')
| -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 ea83d29..f9eeae4 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") #doctest: +SKIP - '?abc' + >>> b'\x80abc'.decode("utf-8", "replace") + '\ufffdabc' >>> b'\x80abc'.decode("utf-8", "ignore") 'abc' |