[Python-checkins] cpython (merge 3.2 -> default): #15949, 15899: merge with 3.2.
ezio.melotti
python-checkins at python.org
Sat Sep 22 10:25:43 CEST 2012
http://hg.python.org/cpython/rev/832999a97e59
changeset: 79095:832999a97e59
parent: 79093:3e677956eef4
parent: 79094:0799fd1f8887
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Sat Sep 22 11:25:22 2012 +0300
summary:
#15949, 15899: merge with 3.2.
files:
Doc/howto/unicode.rst | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -262,8 +262,8 @@
...
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'
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list