#13613: merge with 3.2.

This commit is contained in:
Ezio Melotti 2011-12-17 01:20:02 +02:00
commit 9987d9351c
1 changed files with 6 additions and 6 deletions

View File

@ -1021,16 +1021,16 @@ objects a little more gracefully:
Suppose you are writing a poker program where a player's hand is represented as 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" 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. representing the card with that value.
To see if a given string is a valid hand, one could do the following: To see if a given string is a valid hand, one could do the following:
>>> valid = re.compile(r"[0-9akqj]{5}$") >>> valid = re.compile(r"^[a2-9tjqk]{5}$")
>>> displaymatch(valid.match("ak05q")) # Valid. >>> displaymatch(valid.match("akt5q")) # Valid.
"<Match: 'ak05q', groups=()>" "<Match: 'akt5q', groups=()>"
>>> displaymatch(valid.match("ak05e")) # Invalid. >>> displaymatch(valid.match("akt5e")) # Invalid.
>>> displaymatch(valid.match("ak0")) # Invalid. >>> displaymatch(valid.match("akt")) # Invalid.
>>> displaymatch(valid.match("727ak")) # Valid. >>> displaymatch(valid.match("727ak")) # Valid.
"<Match: '727ak', groups=()>" "<Match: '727ak', groups=()>"