diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example index e6816f27..d7cd3a17 100644 --- a/pyfpdb/HUD_config.xml.example +++ b/pyfpdb/HUD_config.xml.example @@ -252,49 +252,46 @@ Left-Drag to Move" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index ee6d0bf2..ef5cdae4 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -683,9 +683,15 @@ class HoldemOmahaHand(Hand): hhc.readPlayerStacks(self) hhc.compilePlayerRegexs(self) hhc.markStreets(self) + if self.cancelled: return - hhc.readBlinds(self) + + try: hhc.readBlinds(self) + except: + print "*** Parse error reading blinds (check compilePlayerRegexs as a likely culprit)", self + return + hhc.readAntes(self) hhc.readButton(self) hhc.readHeroCards(self) diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index 8faf5dfb..37ba831f 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -441,6 +441,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 + self.obs = "" elif self.filetype == "xml": doc = xml.dom.minidom.parse(filename) self.doc = doc diff --git a/pyfpdb/Stats.py b/pyfpdb/Stats.py index 84ba89d9..e38b5806 100755 --- a/pyfpdb/Stats.py +++ b/pyfpdb/Stats.py @@ -770,10 +770,10 @@ def ffreq1(stat_dict, player): ) except: return (stat, - '%3.1f' % (0) + '%', - 'ff1=%3.1f' % (0) + '%', - 'ff_1=%3.1f' % (0) + '%', - '(%d/%d)' % (0, 0), + 'NA', + 'ff1=NA', + 'ff_1=NA', + '(0/0)', '% fold frequency flop/4th' )