GuiBulkImport: fix indentation error
Hand: fix Pot __str__ to support infinite side pots
This commit is contained in:
parent
31f8db1788
commit
b27b697ec6
|
@ -1323,31 +1323,19 @@ class Pot(object):
|
||||||
# Total pot $124.30 Main pot $98.90. Side pot $23.40. | Rake $2
|
# Total pot $124.30 Main pot $98.90. Side pot $23.40. | Rake $2
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
|
if self.sym is None:
|
||||||
|
self.sym = "C"
|
||||||
if self.total is None:
|
if self.total is None:
|
||||||
print "call Pot.end() before printing pot total"
|
print "call Pot.end() before printing pot total"
|
||||||
# NB if I'm sure end() is idempotent, call it here.
|
# NB if I'm sure end() is idempotent, call it here.
|
||||||
raise FpdbParseError
|
raise FpdbParseError
|
||||||
|
|
||||||
|
ret = "Total pot %s%.2f" % (self.sym, self.total)
|
||||||
|
if len(self.pots) < 2:
|
||||||
|
return ret;
|
||||||
|
ret += " Main pot %s%.2f" % (self.sym, self.pots[0])
|
||||||
|
|
||||||
# TODO: This really neeads to be a loop to handle multiple side pots
|
return ret + ''.join([ (" Side pot %s%.2f." % (self.sym, self.pots[x]) ) for x in xrange(1, len(self.pots)) ])
|
||||||
if len(self.pots) == 1: # (only use Total pot)
|
|
||||||
return "Total pot %s%.2f" % (self.sym, self.total,)
|
|
||||||
elif len(self.pots) == 2:
|
|
||||||
return "Total pot %s%.2f Main pot %s%.2f. Side pot %s%2.f." % (self.sym, self.total, self.sym, self.pots[0], self.sym, self.pots[1])
|
|
||||||
elif len(self.pots) == 3:
|
|
||||||
return "Total pot %s%.2f Main pot $%.2f. Side pot-1 %s%2.2f. Side pot-2 %s%.2f." % (self.sym, self.total, self.sym, self.pots[0], self.sym, self.pots[1], self.sym, self.pots[2])
|
|
||||||
elif len(self.pots) == 0:
|
|
||||||
# no small blind and walk in bb (hopefully)
|
|
||||||
return "Total pot %s%.2f" % (self.sym, self.total,)
|
|
||||||
else:
|
|
||||||
return ("too many pots.. no small blind and walk in bb?. self.pots: %s" %(self.pots))
|
|
||||||
# I don't know stars format for a walk in the bb when sb doesn't post.
|
|
||||||
# The thing to do here is raise a Hand error like fpdb import does and file it into errors.txt
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def assemble(cnxn, handid):
|
def assemble(cnxn, handid):
|
||||||
c = cnxn.cursor()
|
c = cnxn.cursor()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user