Merge branch 'master' of git://git.assembla.com/fpdboz
This commit is contained in:
commit
dc5cbbddce
|
@ -338,7 +338,7 @@ class Fulltilt(HandHistoryConverter):
|
|||
def readPlayerStacks(self, hand):
|
||||
# Split hand text for FTP, as the regex matches the player names incorrectly
|
||||
# in the summary section
|
||||
pre, post = hand.handText.split('SUMMARY')
|
||||
pre, post = hand.handText.split('*** SUMMARY ***')
|
||||
m = self.re_PlayerInfo.finditer(pre)
|
||||
plist = {}
|
||||
|
||||
|
|
|
@ -47,6 +47,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -141,6 +145,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
|
|
@ -47,6 +47,10 @@
|
|||
'street0_3BDone': True,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -141,6 +145,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': True,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -235,6 +243,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -329,6 +341,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -423,6 +439,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -517,6 +537,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': True,
|
||||
'street0_4BDone': True,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
|
|
@ -47,6 +47,10 @@
|
|||
'street0_3BDone': True,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -141,6 +145,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -235,6 +243,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -329,6 +341,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -423,6 +439,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -517,6 +537,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -611,6 +635,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': True,
|
||||
'street0_4BDone': True,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
|
|
@ -47,6 +47,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -141,6 +145,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': True,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -235,6 +243,10 @@
|
|||
'street0_3BDone': True,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -329,6 +341,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': True,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -423,6 +439,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': True,
|
||||
'street0_4BDone': True,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -517,6 +537,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': True,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -611,6 +635,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': True,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -705,6 +733,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': True,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
|
|
@ -47,6 +47,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -141,6 +145,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -235,6 +243,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -329,6 +341,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -423,6 +439,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -517,6 +537,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -611,6 +635,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -705,6 +733,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -799,6 +831,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
|
|
@ -47,6 +47,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -141,6 +145,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -235,6 +243,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -329,6 +341,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -423,6 +439,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -517,6 +537,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -611,6 +635,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
@ -705,6 +733,10 @@
|
|||
'street0_3BDone': False,
|
||||
'street0_4BChance': False,
|
||||
'street0_4BDone': False,
|
||||
'street0_FoldTo3BChance': False,
|
||||
'street0_FoldTo3BDone': False,
|
||||
'street0_FoldTo4BChance': False,
|
||||
'street0_FoldTo4BDone': False,
|
||||
'street1Aggr': False,
|
||||
'street1Bets': 0,
|
||||
'street1CBChance': False,
|
||||
|
|
Loading…
Reference in New Issue
Block a user