summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-09-23 16:03:21 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2012-09-23 16:03:21 +0300
commit2b7a71d6e592dcc8257b1007fffd2fdd3cd193af (patch)
tree71eff9543c9a6414d54780eff8ceb6e8d2a4f004
parent707bce4a66bbe34fc346775543876161379cfb3e (diff)
parent20b8d992b008672d52a84c8d35992033ccfc9d84 (diff)
downloadcpython-git-2b7a71d6e592dcc8257b1007fffd2fdd3cd193af.tar.gz
#15949, #15899: merge with 3.2.
-rw-r--r--Doc/howto/unicode.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
index ea83d29199..f9eeae4c02 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'