From a5de7c9b6b1416bbef62aab5ae51a1c0170a97b3 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 3 Nov 2009 15:14:20 -0500 Subject: [PATCH] cleanup --- pyfpdb/HandHistoryConverter.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index 6edb9029..bced9d93 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -150,9 +150,9 @@ Otherwise, finish at EOF. for handText in self.tailHands(): try: self.processHand(handText) - numHands+=1 + numHands += 1 except FpdbParseError, e: - numErrors+=1 + numErrors += 1 log.warning("Failed to convert hand %s" % e.hid) log.debug(handText) else: @@ -166,7 +166,7 @@ Otherwise, finish at EOF. try: self.processedHands.append(self.processHand(handText)) except FpdbParseError, e: - numErrors+=1 + numErrors += 1 log.warning("Failed to convert hand %s" % e.hid) log.debug(handText) numHands = len(handsList) @@ -195,7 +195,8 @@ This requires a regex that greedily groups and matches the 'splitter' between ha which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py. """ - if self.in_path == '-': raise StopIteration + if self.in_path == '-': + raise StopIteration interval = 1.0 # seconds to sleep between reads for new data fd = codecs.open(self.in_path,'r', self.codepage) data = '' @@ -396,7 +397,7 @@ or None if we fail to get the info """ if True: # basically.. I don't know sane = True - if(self.in_path != '-' and self.out_path == self.in_path): + if self.in_path != '-' and self.out_path == self.in_path: print "HH Sanity Check: output and input files are the same, check config" sane = False @@ -417,16 +418,19 @@ or None if we fail to get the info """ for l in list: # print "'" + l + "'" hands = hands + [Hand.Hand(self.sitename, self.gametype, l)] + # TODO: This looks like it could be replaced with a list comp.. ? return hands def __listof(self, x): - if isinstance(x, list) or isinstance(x, tuple): return x - else: return [x] + if isinstance(x, list) or isinstance(x, tuple): + return x + else: + return [x] def readFile(self): """Open in_path according to self.codepage. Exceptions caught further up""" - if(self.filetype == "text"): + if self.filetype == "text": if self.in_path == '-': # read from stdin log.debug("Reading stdin with %s" % self.codepage) # is this necessary? or possible? or what? @@ -446,7 +450,7 @@ or None if we fail to get the info """ pass else: print "unable to read file with any codec in list!", self.in_path - elif(self.filetype == "xml"): + elif self.filetype == "xml": doc = xml.dom.minidom.parse(filename) self.doc = doc @@ -474,7 +478,8 @@ or None if we fail to get the info """ def maxOccSeat(self, hand): max = 0 for player in hand.players: - if player[0] > max: max = player[0] + if player[0] > max: + max = player[0] return max def getStatus(self):