Merge branch 'master' of git://github.com/grindi/fpdb-grindi

Conflicts:
	pyfpdb/HandHistoryConverter.py
This commit is contained in:
Worros 2009-08-12 22:51:49 +08:00
commit 0baabb0368
3 changed files with 52 additions and 52 deletions

View File

@ -150,7 +150,7 @@ class Fulltilt(HandHistoryConverter):
self.obs = self.obs.replace('\r\n', '\n') self.obs = self.obs.replace('\r\n', '\n')
if self.obs == "" or self.obs == None: if self.obs == "" or self.obs == None:
logging.info("Read no hands.") logging.info("Read no hands.")
return return []
return re.split(self.re_SplitHands, self.obs) return re.split(self.re_SplitHands, self.obs)
def readHandInfo(self, hand): def readHandInfo(self, hand):

View File

@ -215,7 +215,7 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
self.obs = self.obs.replace('\r\n', '\n') self.obs = self.obs.replace('\r\n', '\n')
if self.obs == "" or self.obs == None: if self.obs == "" or self.obs == None:
log.info("Read no hands.") log.info("Read no hands.")
return return []
return re.split(self.re_SplitHands, self.obs) return re.split(self.re_SplitHands, self.obs)
def processHand(self, handText): def processHand(self, handText):

View File

@ -442,7 +442,7 @@ class PartyPoker(HandHistoryConverter):
if actionType == 'raises': if actionType == 'raises':
if street == 'PREFLOP' and \ if street == 'PREFLOP' and \
playerName in [item[0] for item in hand.actions['BLINDSANTES']]: playerName in [item[0] for item in hand.actions['BLINDSANTES'] if item[2]!='ante']:
# preflop raise from blind # preflop raise from blind
hand.addRaiseBy( street, playerName, amount ) hand.addRaiseBy( street, playerName, amount )
else: else: