New blinds format 'Ante/Small Blind' -> 'Small Blind' & 'Big blind/Br…

…ing in' -> 'Big blind'

pyfpdb/BovadaToFpdb.py

@@ -125,10 +125,10 @@ class Bovada(HandHistoryConverter):
     re_DateTime     = re.compile("""(?P<Y>[0-9]{4})\-(?P<M>[0-9]{2})\-(?P<D>[0-9]{2})[\- ]+(?P<H>[0-9]+):(?P<MIN>[0-9]+):(?P<S>[0-9]+)""", re.MULTILINE)
     # These used to be compiled per player, but regression tests say
     # we don't have to, and it makes life faster.
-    re_PostSB           = re.compile(r"^%(PLYR)s (\s?\[ME\]\s)?: (Ante\/Small (B|b)lind|Posts chip) (?P<CURRENCY>%(CUR)s)(?P<SB>[%(NUM)s]+)" %  substitutions, re.MULTILINE)
-    re_PostBB           = re.compile(r"^%(PLYR)s (\s?\[ME\]\s)?: Big blind\/Bring in (?P<CURRENCY>%(CUR)s)(?P<BB>[%(NUM)s]+)" %  substitutions, re.MULTILINE)
+    re_PostSB           = re.compile(r"^%(PLYR)s (\s?\[ME\]\s)?: (Ante\/Small (B|b)lind|Posts chip|Small (B|b)lind) (?P<CURRENCY>%(CUR)s)(?P<SB>[%(NUM)s]+)" %  substitutions, re.MULTILINE)
+    re_PostBB           = re.compile(r"^%(PLYR)s (\s?\[ME\]\s)?: (Big blind\/Bring in|Big blind) (?P<CURRENCY>%(CUR)s)(?P<BB>[%(NUM)s]+)" %  substitutions, re.MULTILINE)
     re_Antes            = re.compile(r"^%(PLYR)s (\s?\[ME\]\s)?: Ante chip %(CUR)s(?P<ANTE>[%(NUM)s]+)" % substitutions, re.MULTILINE)
-    re_BringIn          = re.compile(r"^%(PLYR)s (\s?\[ME\]\s)?: (Bring_in chip|Big blind\/Bring in)\s?(\(timeout\) )?%(CUR)s(?P<BRINGIN>[%(NUM)s]+)" % substitutions, re.MULTILINE)
+    re_BringIn          = re.compile(r"^%(PLYR)s (\s?\[ME\]\s)?: (Bring_in chip|Big blind\/Bring in|Bring in)\s?(\(timeout\) )?%(CUR)s(?P<BRINGIN>[%(NUM)s]+)" % substitutions, re.MULTILINE)
     re_PostBoth         = re.compile(r"^%(PLYR)s (\s?\[ME\]\s)?: Posts dead chip %(CUR)s(?P<SBBB>[%(NUM)s]+)" %  substitutions, re.MULTILINE)
     re_HeroCards        = re.compile(r"^%(PLYR)s  ?\[ME\] : Card dealt to a spot \[(?P<NEWCARDS>.+?)\]" % substitutions, re.MULTILINE)
     re_Action           = re.compile(r"""(?P<ACTION>

pyfpdb/regression-test-files/cash/Bovada/Flop/FLHE-6max-USD - $30-$60 - 201512.new.blinds.txt

@@ -0,0 +1,54 @@
+Bovada Hand #3183548059 TBL#10253202 HOLDEM Fixed Limit - 2015-12-01 04:04:36
+Seat 1: UTG+2 [ME] ($2,700 in chips)
+Seat 2: Dealer ($1,077 in chips)
+Seat 3: Small Blind ($2,292.50 in chips)
+Seat 4: Big Blind ($3,150 in chips)
+Seat 5: UTG ($1,692 in chips)
+Seat 6: UTG+1 ($1,846.67 in chips)
+Dealer : Set dealer [2] 
+Small Blind : Small Blind $15 
+Big Blind : Big blind $30 
+*** HOLE CARDS ***
+UTG+2  [ME] : Card dealt to a spot [Js 6s] 
+Dealer : Card dealt to a spot [Kc Kh] 
+Small Blind : Card dealt to a spot [2h 7d] 
+Big Blind : Card dealt to a spot [Kd 8d] 
+UTG : Card dealt to a spot [Ac 6c] 
+UTG+1 : Card dealt to a spot [4h 6d] 
+UTG : Raises $60 to $60
+UTG+1 : Calls $60 
+UTG+2  [ME] : Folds
+Dealer : Raises $90 to $90
+Small Blind : Folds
+Big Blind : Folds
+UTG : Calls $30 
+UTG+1 : Calls $30 
+*** FLOP *** [9d 7h 5h]
+UTG : Checks
+UTG+1 : Checks
+Dealer : Bets $30 
+UTG : Calls $30 
+UTG+1 : Calls $30 
+*** TURN *** [9d 7h 5h] [8s]
+UTG : Bets $60 
+UTG+1 : Calls $60 
+Dealer : Calls $60 
+*** RIVER *** [9d 7h 5h 8s] [Jd]
+UTG : Checks
+UTG+1 : Bets $60 
+Dealer : Calls $60 
+UTG : Calls $60 
+UTG+1 : Showdown [9d 8s 7h 6d 5h] (Straight)
+Dealer : Mucks [Kc Kh] (One pair)
+UTG : Showdown [9d 8s 7h 6c 5h] (Straight)
+UTG : Hand result $381 
+UTG+1 : Hand result $381 
+*** SUMMARY ***
+Total Pot($765)
+Board [9d 7h 5h 8s Jd]
+Seat+1: UTG+2 Folded before the FLOP
+Seat+2: Dealer [Mucked] [Kc Kh]  
+Seat+3: Small Blind Folded before the FLOP
+Seat+4: Big Blind Folded before the FLOP
+Seat+5: UTG $381  with Straight [Ac 6c-9d 8s 7h 6c 5h]  
+Seat+6: UTG+1 $381  with Straight [4h 6d-9d 8s 7h 6d 5h]