#15949, 15899: merge with 3.2.

efe4bdcc · Ezio Melotti · 37bd83fa · 05aafb29 · efe4bdcc
Commit efe4bdcc authored Sep 22, 2012 by Ezio Melotti
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Doc/howto/unicode.rst Doc/howto/unicode.rst +2 -2

No files found.
--- 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")
+    >>> b'\x80abc'.decode("utf-8", "replace")  #doctest: +SKIP
-    '�abc'
+    '?abc'
    >>> b'\x80abc'.decode("utf-8", "ignore")
    'abc'