From 440602198f81cc09d9ecb5ee4c44858057e81545 Mon Sep 17 00:00:00 2001 From: Worros Date: Thu, 26 Feb 2009 01:48:41 +0900 Subject: [PATCH] Fix(?) HeroCards regex for stud --- pyfpdb/FulltiltToFpdb.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py index 1ad2c330..a2420251 100755 --- a/pyfpdb/FulltiltToFpdb.py +++ b/pyfpdb/FulltiltToFpdb.py @@ -46,7 +46,7 @@ class FullTilt(HandHistoryConverter): self.re_Antes = re.compile(r"^%s antes \$?(?P[.0-9]+)" % player_re, re.MULTILINE) self.re_BringIn = re.compile(r"^%s brings in for \$?(?P[.0-9]+)" % player_re, re.MULTILINE) self.re_PostBoth = re.compile(r"^%s posts small \& big blinds \[\$? (?P[.0-9]+)" % player_re, re.MULTILINE) - self.re_HeroCards = re.compile(r"^Dealt to %s \[(?P.*)\]( \[(?P.*)\])?" % player_re, re.MULTILINE) + self.re_HeroCards = re.compile(r"^Dealt to %s \[(?P[AKQJT0-9hcsd ]+)\]( \[(?P[AKQJT0-9hcsd ]+)\])?" % player_re, re.MULTILINE) self.re_Action = re.compile(r"^%s(?P bets| checks| raises to| calls| folds)(\s\$(?P[.\d]+))?" % player_re, re.MULTILINE) self.re_ShowdownAction = re.compile(r"^%s shows \[(?P.*)\]" % player_re, re.MULTILINE) self.re_CollectPot = re.compile(r"^Seat (?P[0-9]+): %s (\(button\) |\(small blind\) |\(big blind\) )?(collected|showed \[.*\] and won) \(\$(?P[.\d]+)\)(, mucked| with.*)" % player_re, re.MULTILINE) @@ -188,7 +188,6 @@ class FullTilt(HandHistoryConverter): #Used for stud hands - borrows the HeroCards regex for now. m = self.re_HeroCards.finditer(hand.streets.group(street)) print "DEBUG: razz/stud readPlayerCards" - print "DEBUG: STREET: %s", street print hand.streets.group(street) for player in m: print player.groups()