From 23818e0c6b7e91b84bd261e43cb9a4af585b37c1 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Thu, 10 Mar 2011 04:36:20 +0100 Subject: [PATCH] more string unification --- pyfpdb/EverestToFpdb.py | 1 + pyfpdb/FulltiltToFpdb.py | 9 +++++---- pyfpdb/OnGameToFpdb.py | 2 +- pyfpdb/PkrToFpdb.py | 2 +- pyfpdb/PokerStarsToFpdb.py | 2 +- pyfpdb/WinamaxToFpdb.py | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pyfpdb/EverestToFpdb.py b/pyfpdb/EverestToFpdb.py index f40a9abf..52910b5b 100644 --- a/pyfpdb/EverestToFpdb.py +++ b/pyfpdb/EverestToFpdb.py @@ -104,6 +104,7 @@ class Everest(HandHistoryConverter): if not m2: tmp = handText[0:100] + log.error(_("determineGameType: Raising FpdbParseError")) raise FpdbParseError(_("Unable to recognise handinfo from: '%s'") % tmp) self.info = {} diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py index 337e9e53..b348cf7c 100755 --- a/pyfpdb/FulltiltToFpdb.py +++ b/pyfpdb/FulltiltToFpdb.py @@ -248,9 +248,9 @@ class Fulltilt(HandHistoryConverter): info['sb'] = self.Lim_Blinds[mg['BB']][0] info['bb'] = self.Lim_Blinds[mg['BB']][1] except KeyError: - log.error(_("determineGameType: Lim_Blinds has no lookup for '%s'") % mg['BB']) + log.error(_("Lim_Blinds has no lookup for '%s'") % mg['BB']) log.error(_("determineGameType: Raising FpdbParseError")) - raise FpdbParseError(_("determineGameType: Lim_Blinds has no lookup for '%s'") % mg['BB']) + raise FpdbParseError(_("Lim_Blinds has no lookup for '%s'") % mg['BB']) if mg['GAME'] is not None: (info['base'], info['category']) = games[mg['GAME']] @@ -263,8 +263,9 @@ class Fulltilt(HandHistoryConverter): m = self.re_HandInfo.search(hand.handText) if m is None: tmp = hand.handText[0:100] - log.error(_("readHandInfo: Unable to recognise handinfo from: '%s'") % tmp) - raise FpdbParseError(_("No match in readHandInfo.")) + log.error(_("Unable to recognise handinfo from: '%s'") % tmp) + log.error(_("readHandInfo: Raising FpdbParseError")) + raise FpdbParseError(_("Unable to recognise handinfo from: '%s'")) #print "DEBUG: m.groupdict: %s" % m.groupdict() hand.handid = m.group('HID') diff --git a/pyfpdb/OnGameToFpdb.py b/pyfpdb/OnGameToFpdb.py index ab087440..9b800499 100755 --- a/pyfpdb/OnGameToFpdb.py +++ b/pyfpdb/OnGameToFpdb.py @@ -172,7 +172,7 @@ class OnGame(HandHistoryConverter): info['limitType'] = self.limits[mg['LIMIT']] else: tmp = handText[0:100] - log.error(_("determineGameType: limit not found in self.limits(%s). hand: '%s'") % (str(mg),tmp)) + log.error(_("limit not found in self.limits(%s). hand: '%s'") % (str(mg),tmp)) log.error(_("determineGameType: Raising FpdbParseError")) raise FpdbParseError(_("limit not found in self.limits(%s). hand: '%s'") % (str(mg),tmp)) if 'GAME' in mg: diff --git a/pyfpdb/PkrToFpdb.py b/pyfpdb/PkrToFpdb.py index 96185382..2d9c37f7 100755 --- a/pyfpdb/PkrToFpdb.py +++ b/pyfpdb/PkrToFpdb.py @@ -150,7 +150,7 @@ class Pkr(HandHistoryConverter): info['sb'] = self.Lim_Blinds[mg['BB']][0] info['bb'] = self.Lim_Blinds[mg['BB']][1] except KeyError: - log.error(_("determineGameType: Lim_Blinds has no lookup for '%s'") % mg['BB']) + log.error(_("Lim_Blinds has no lookup for '%s'") % mg['BB']) log.error(_("determineGameType: Raising FpdbParseError")) raise FpdbParseError(_("Lim_Blinds has no lookup for '%s'") % mg['BB']) diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py index 1d836dde..9ed50190 100644 --- a/pyfpdb/PokerStarsToFpdb.py +++ b/pyfpdb/PokerStarsToFpdb.py @@ -208,7 +208,7 @@ class PokerStars(HandHistoryConverter): info['sb'] = self.Lim_Blinds[mg['BB']][0] info['bb'] = self.Lim_Blinds[mg['BB']][1] except KeyError: - log.error(_("determineGameType: Lim_Blinds has no lookup for '%s'") % mg['BB']) + log.error(_("Lim_Blinds has no lookup for '%s'") % mg['BB']) log.error(_("determineGameType: Raising FpdbParseError")) raise FpdbParseError(_("Lim_Blinds has no lookup for '%s'") % mg['BB']) diff --git a/pyfpdb/WinamaxToFpdb.py b/pyfpdb/WinamaxToFpdb.py index f0815a35..871c1688 100644 --- a/pyfpdb/WinamaxToFpdb.py +++ b/pyfpdb/WinamaxToFpdb.py @@ -187,7 +187,7 @@ class Winamax(HandHistoryConverter): info['limitType'] = self.limits[mg['LIMIT']] else: tmp = handText[0:100] - log.error(_("determineGameType: limit not found in self.limits(%s). hand: '%s'") % (str(mg),tmp)) + log.error(_("limit not found in self.limits(%s). hand: '%s'") % (str(mg),tmp)) log.error(_("determineGameType: Raising FpdbParseError")) raise FpdbParseError(_("limit not found in self.limits(%s). hand: '%s'") % (str(mg),tmp)) if 'GAME' in mg: