[Python-checkins] cpython (merge 3.2 -> default): #15949, #15899: merge with 3.2.

Sun Sep 23 15:03:46 CEST 2012

http://hg.python.org/cpython/rev/1aebae2f68da
changeset: 79100:1aebae2f68da
parent: 79098:178f9042af81
parent: 79099:9c666683e309
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Sun Sep 23 16:03:21 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") #doctest: +SKIP
- '?abc'
+ >>> b'\x80abc'.decode("utf-8", "replace")
+ '\ufffdabc'
 >>> b'\x80abc'.decode("utf-8", "ignore")
 'abc'
 
-- 
Repository URL: http://hg.python.org/cpython
