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

This commit is contained in:
Eric Blade 2010-08-03 19:40:21 -04:00
commit a5795c4cbe
2 changed files with 8 additions and 6 deletions

View File

@ -79,13 +79,13 @@ class Hand(object):
self.fee = None # the Database code is looking for this one .. ? self.fee = None # the Database code is looking for this one .. ?
self.level = None self.level = None
self.mixed = None self.mixed = None
self.speed = "Normal" self.speed = None
self.isRebuy = False self.isRebuy = None
self.isAddOn = False self.isAddOn = None
self.isKO = False self.isKO = None
self.koBounty = None self.koBounty = None
self.isMatrix = False self.isMatrix = None
self.isShootout = False self.isShootout = None
self.added = None self.added = None
self.addedCurrency = None self.addedCurrency = None
self.tourneyComment = None self.tourneyComment = None

View File

@ -262,6 +262,8 @@ class PokerStars(HandHistoryConverter):
info['BOUNTY'] = info['BOUNTY'].strip(u'$€') # Strip here where it isn't 'None' info['BOUNTY'] = info['BOUNTY'].strip(u'$€') # Strip here where it isn't 'None'
hand.koBounty = int(100*Decimal(info['BOUNTY'])) hand.koBounty = int(100*Decimal(info['BOUNTY']))
hand.isKO = True hand.isKO = True
else:
hand.isKO = False
info['BIRAKE'] = info['BIRAKE'].strip(u'$€') info['BIRAKE'] = info['BIRAKE'].strip(u'$€')