changeset: 74005:f2e1867f33b8
parent: 74002:279b0aee0cfb
parent: 74004:0b86da9d6964
user: Ezio Melotti <ezio.melotti@gmail.com>
date: Sat Dec 17 01:20:02 2011 +0200
files: Doc/library/re.rst
description:
#13613: merge with 3.2.
diff -r 279b0aee0cfb -r f2e1867f33b8 Doc/library/re.rst
--- a/Doc/library/re.rst	Fri Dec 16 23:56:01 2011 +0100
+++ b/Doc/library/re.rst	Sat Dec 17 01:20:02 2011 +0200
@@ -1021,16 +1021,16 @@
 
 Suppose you are writing a poker program where a player's hand is represented as
 a 5-character string with each character representing a card, "a" for ace, "k"
-for king, "q" for queen, j for jack, "0" for 10, and "1" through "9"
+for king, "q" for queen, "j" for jack, "t" for 10, and "2" through "9"
 representing the card with that value.
 
 To see if a given string is a valid hand, one could do the following:
 
->>> valid = re.compile(r"[0-9akqj]{5}$")
->>> displaymatch(valid.match("ak05q")) # Valid.
- "<match: 'ak05q', groups=()>"
->>> displaymatch(valid.match("ak05e")) # Invalid.
->>> displaymatch(valid.match("ak0")) # Invalid.
+>>> valid = re.compile(r"^[a2-9tjqk]{5}$")
+>>> displaymatch(valid.match("akt5q")) # Valid.
+ "<match: 'akt5q', groups=()>"
+>>> displaymatch(valid.match("akt5e")) # Invalid.
+>>> displaymatch(valid.match("akt")) # Invalid.
>>> displaymatch(valid.match("727ak")) # Valid.
 "<match: '727ak', groups=()>"
 
</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/f2e1867f33b8">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://hg.python.org/cpython/rev/f2e1867f33b8" 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>