Merge branch 'master' of git://git.assembla.com/fpdboz

This commit is contained in:
Donoban 2011-02-02 11:54:48 +01:00
commit dc5cbbddce
7 changed files with 161 additions and 1 deletions

View File

@ -338,7 +338,7 @@ class Fulltilt(HandHistoryConverter):
def readPlayerStacks(self, hand): def readPlayerStacks(self, hand):
# Split hand text for FTP, as the regex matches the player names incorrectly # Split hand text for FTP, as the regex matches the player names incorrectly
# in the summary section # in the summary section
pre, post = hand.handText.split('SUMMARY') pre, post = hand.handText.split('*** SUMMARY ***')
m = self.re_PlayerInfo.finditer(pre) m = self.re_PlayerInfo.finditer(pre)
plist = {} plist = {}

View File

@ -47,6 +47,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -141,6 +145,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,

View File

@ -47,6 +47,10 @@
'street0_3BDone': True, 'street0_3BDone': True,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -141,6 +145,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': True, 'street0_4BChance': True,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -235,6 +243,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -329,6 +341,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -423,6 +439,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -517,6 +537,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': True, 'street0_4BChance': True,
'street0_4BDone': True, 'street0_4BDone': True,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,

View File

@ -47,6 +47,10 @@
'street0_3BDone': True, 'street0_3BDone': True,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -141,6 +145,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -235,6 +243,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -329,6 +341,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -423,6 +439,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -517,6 +537,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -611,6 +635,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': True, 'street0_4BChance': True,
'street0_4BDone': True, 'street0_4BDone': True,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,

View File

@ -47,6 +47,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -141,6 +145,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': True, 'street0_4BChance': True,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -235,6 +243,10 @@
'street0_3BDone': True, 'street0_3BDone': True,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -329,6 +341,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': True, 'street0_4BChance': True,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -423,6 +439,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': True, 'street0_4BChance': True,
'street0_4BDone': True, 'street0_4BDone': True,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -517,6 +537,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': True, 'street0_4BChance': True,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -611,6 +635,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': True, 'street0_4BChance': True,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -705,6 +733,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': True, 'street0_4BChance': True,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,

View File

@ -47,6 +47,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -141,6 +145,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -235,6 +243,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -329,6 +341,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -423,6 +439,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -517,6 +537,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -611,6 +635,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -705,6 +733,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -799,6 +831,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,

View File

@ -47,6 +47,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -141,6 +145,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -235,6 +243,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -329,6 +341,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -423,6 +439,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -517,6 +537,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -611,6 +635,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,
@ -705,6 +733,10 @@
'street0_3BDone': False, 'street0_3BDone': False,
'street0_4BChance': False, 'street0_4BChance': False,
'street0_4BDone': False, 'street0_4BDone': False,
'street0_FoldTo3BChance': False,
'street0_FoldTo3BDone': False,
'street0_FoldTo4BChance': False,
'street0_FoldTo4BDone': False,
'street1Aggr': False, 'street1Aggr': False,
'street1Bets': 0, 'street1Bets': 0,
'street1CBChance': False, 'street1CBChance': False,