changeset: 79002:142fbadd0ae1
branch: 2.7
parent: 78982:706115cb2cdb
user: Senthil Kumaran <senthil@uthcode.com>
date: Tue Sep 11 22:14:23 2012 -0700
files: Doc/howto/unicode.rst
description:
Fix issue #15899 - howto/unicode.rst doctest corrections for 2.7 branch.
diff -r 706115cb2cdb -r 142fbadd0ae1 Doc/howto/unicode.rst
--- a/Doc/howto/unicode.rst	Tue Sep 11 01:55:04 2012 +0200
+++ b/Doc/howto/unicode.rst	Tue Sep 11 22:14:23 2012 -0700
@@ -253,11 +253,11 @@
>>> s = unicode('abcdef')
>>> type(s)
 <type 'unicode'>
->>> unicode('abcdef' + chr(255))
+>>> unicode('abcdef' + chr(255)) #doctest: +NORMALIZE_WHITESPACE
 Traceback (most recent call last):
- File "<stdin>", line 1, in ?
+ ...
 UnicodeDecodeError: 'ascii' codec can't decode byte 0xff in position 6:
- ordinal not in range(128)
+ ordinal not in range(128)
 
 The ``errors`` argument specifies the response when the input string can't be
 converted according to the encoding's rules. Legal values for this argument are
@@ -265,11 +265,11 @@
 'REPLACEMENT CHARACTER'), or 'ignore' (just leave the character out of the
 Unicode result). The following examples show the differences::
 
->>> unicode('\x80abc', errors='strict')
+>>> unicode('\x80abc', errors='strict') #doctest: +NORMALIZE_WHITESPACE
 Traceback (most recent call last):
- File "<stdin>", line 1, in ?
+ ...
 UnicodeDecodeError: 'ascii' codec can't decode byte 0x80 in position 0:
- ordinal not in range(128)
+ ordinal not in range(128)
>>> unicode('\x80abc', errors='replace')
 u'\ufffdabc'
>>> unicode('\x80abc', errors='ignore')
@@ -312,10 +312,11 @@
 operation; Python's default ASCII encoding will be used, so characters greater
 than 127 will cause an exception::
 
->>> s.find('Was\x9f')
+>>> s.find('Was\x9f') #doctest: +NORMALIZE_WHITESPACE
 Traceback (most recent call last):
- File "<stdin>", line 1, in ?
- UnicodeDecodeError: 'ascii' codec can't decode byte 0x9f in position 3: ordinal not in range(128)
+ ...
+ UnicodeDecodeError: 'ascii' codec can't decode byte 0x9f in position 3:
+ ordinal not in range(128)
>>> s.find(u'Was\x9f')
 -1
 
@@ -333,10 +334,11 @@
>>> u = unichr(40960) + u'abcd' + unichr(1972)
>>> u.encode('utf-8')
 '\xea\x80\x80abcd\xde\xb4'
->>> u.encode('ascii')
+>>> u.encode('ascii') #doctest: +NORMALIZE_WHITESPACE
 Traceback (most recent call last):
- File "<stdin>", line 1, in ?
- UnicodeEncodeError: 'ascii' codec can't encode character '\ua000' in position 0: ordinal not in range(128)
+ ...
+ UnicodeEncodeError: 'ascii' codec can't encode character u'\ua000' in
+ position 0: ordinal not in range(128)
>>> u.encode('ascii', 'ignore')
 'abcd'
>>> u.encode('ascii', 'replace')
@@ -384,9 +386,9 @@
 ::
 
>>> s = u"a\xac\u1234\u20ac\U00008000"
- ^^^^ two-digit hex escape
- ^^^^^^ four-digit Unicode escape
- ^^^^^^^^^^ eight-digit Unicode escape
+ ... # ^^^^ two-digit hex escape
+ ... # ^^^^^^ four-digit Unicode escape
+ ... # ^^^^^^^^^^ eight-digit Unicode escape
>>> for c in s: print ord(c),
 ...
 97 172 4660 8364 32768
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://hg.python.org/cpython/rev/142fbadd0ae1">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/142fbadd0ae1" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>