summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-12-16 23:20:02 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-12-16 23:20:02 (GMT)
commit9987d9351ca06dbad3b66ab6da52ab4621955f31 (patch)
tree54d7b04036979ebda20cea42d74cafd56041916f
parentaf02e1c85a66009cdc645a64de7d7ee1335c8301 (diff)
parente5b2ac898785ba78a6a81878d77d270fcb5fba61 (diff)
downloadcpython-9987d9351ca06dbad3b66ab6da52ab4621955f31.zip
cpython-9987d9351ca06dbad3b66ab6da52ab4621955f31.tar.gz
cpython-9987d9351ca06dbad3b66ab6da52ab4621955f31.tar.bz2
#13613: merge with 3.2.
-rw-r--r--Doc/library/re.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/re.rst b/Doc/library/re.rst
index 331ffa7..7232cde 100644
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -1021,16 +1021,16 @@ objects a little more gracefully:
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=()>"