From 398a2609ef23e04ff8615de35a669bef1885d769 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Fri, 8 Apr 2011 13:39:56 +0200 Subject: [PATCH] more string cleaning --- pyfpdb/AbsoluteToFpdb.py | 4 ++-- pyfpdb/BetfairToFpdb.py | 2 +- pyfpdb/CarbonToFpdb.py | 2 +- pyfpdb/Charset.py | 12 ++++++------ pyfpdb/Configuration.py | 6 +++--- pyfpdb/Database.py | 2 +- pyfpdb/EverestToFpdb.py | 6 +++--- pyfpdb/EverleafToFpdb.py | 6 +++--- pyfpdb/Filters.py | 2 +- pyfpdb/FulltiltToFpdb.py | 8 ++++---- pyfpdb/GuiAutoImport.py | 4 ++-- pyfpdb/GuiPositionalStats.py | 2 +- pyfpdb/GuiStove.py | 12 ++++++------ pyfpdb/Hand.py | 6 +++--- pyfpdb/ImapFetcher.py | 4 ++-- pyfpdb/OnGameToFpdb.py | 6 +++--- pyfpdb/PacificPokerToFpdb.py | 2 +- pyfpdb/PartyPokerToFpdb.py | 2 +- pyfpdb/PkrToFpdb.py | 2 +- pyfpdb/PokerStarsToFpdb.py | 2 +- pyfpdb/Win2dayToFpdb.py | 2 +- pyfpdb/WinamaxToFpdb.py | 2 +- pyfpdb/iPokerToFpdb.py | 2 +- pyfpdb/test_Database.py | 4 ++-- 24 files changed, 51 insertions(+), 51 deletions(-) diff --git a/pyfpdb/AbsoluteToFpdb.py b/pyfpdb/AbsoluteToFpdb.py index fe4f87e9..65d73712 100755 --- a/pyfpdb/AbsoluteToFpdb.py +++ b/pyfpdb/AbsoluteToFpdb.py @@ -321,7 +321,7 @@ class Absolute(HandHistoryConverter): hand.involved = False def readStudPlayerCards(self, hand, street): - logging.warning(_("Absolute cannot read all stud/razz hands yet.")) + logging.warning(_("%s cannot read all stud/razz hands yet.") % hand.sitename) def readAction(self, hand, street): logging.debug("readAction (%s)" % street) @@ -345,7 +345,7 @@ class Absolute(HandHistoryConverter): bet = action.group('BET').replace(',', '') hand.addComplete( street, action.group('PNAME'), bet) else: - logging.debug(_("Unimplemented readAction: '%s' '%s'") % (action.group('PNAME'), action.group('ATYPE'))) + logging.debug(_("Unimplemented %s: '%s' '%s'") % ("readAction", action.group('PNAME'), action.group('ATYPE'))) def readShowdownActions(self, hand): diff --git a/pyfpdb/BetfairToFpdb.py b/pyfpdb/BetfairToFpdb.py index 2ef533da..b48ff510 100755 --- a/pyfpdb/BetfairToFpdb.py +++ b/pyfpdb/BetfairToFpdb.py @@ -196,7 +196,7 @@ class Betfair(HandHistoryConverter): elif action.group('ATYPE') == 'checks': hand.addCheck( street, action.group('PNAME')) else: - sys.stderr.write(_("DEBUG: ") + _("Unimplemented readAction: '%s' '%s'") % (action.group('PNAME'), action.group('ATYPE'))) + sys.stderr.write(_("DEBUG:") + " " + _("Unimplemented %s: '%s' '%s'") % ("readAction", action.group('PNAME'), action.group('ATYPE'))) def readShowdownActions(self, hand): diff --git a/pyfpdb/CarbonToFpdb.py b/pyfpdb/CarbonToFpdb.py index e5b94f96..44fb87ce 100644 --- a/pyfpdb/CarbonToFpdb.py +++ b/pyfpdb/CarbonToFpdb.py @@ -264,7 +264,7 @@ or None if we fail to get the info """ elif action.group('ATYPE') == 'ALL_IN': hand.addAllIn(street, player, action.group('BET')) else: - logging.debug(_("Unimplemented readAction: '%s' '%s'") % (action.group('PSEAT'), action.group('ATYPE'))) + logging.debug(_("Unimplemented %s: '%s' '%s'") % ("readAction", action.group('PSEAT'), action.group('ATYPE'))) def readShowdownActions(self, hand): for shows in self.re_ShowdownAction.finditer(hand.handText): diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py index 694479b5..f1581c73 100644 --- a/pyfpdb/Charset.py +++ b/pyfpdb/Charset.py @@ -40,10 +40,10 @@ def to_utf8(s): _out = unicode(s, Configuration.LOCALE_ENCODING).encode('utf-8') return _out except UnicodeDecodeError: - sys.stderr.write(_('Could not convert: "%s"\n') % s) + sys.stderr.write(_('Could not convert: "%s"') % (s+"\n")) raise except UnicodeEncodeError: - sys.stderr.write(_('Could not encode: "%s"\n') % s) + sys.stderr.write(_('Could not encode: "%s"') % (s+"\n")) raise except TypeError: # TypeError is raised when we give unicode() an already encoded string return s @@ -55,10 +55,10 @@ def to_db_utf8(s): (_out, _len) = encoder_to_utf.encode(unicode(s)) return _out except UnicodeDecodeError: - sys.stderr.write(_('Could not convert: "%s"\n') % s) + sys.stderr.write(_('Could not convert: "%s"') % (s+"\n")) raise except UnicodeEncodeError: - sys.stderr.write(_('Could not encode: "%s"\n') % s) + sys.stderr.write(_('Could not encode: "%s"') % (s+"\n")) raise def to_gui(s): @@ -70,8 +70,8 @@ def to_gui(s): (_out, _len) = encoder_to_sys.encode(s, 'replace') return _out except UnicodeDecodeError: - sys.stderr.write(_('Could not convert: "%s"\n') % s) + sys.stderr.write(_('Could not convert: "%s"') % (s+"\n")) raise except UnicodeEncodeError: - sys.stderr.write(_('Could not encode: "%s"\n') % s) + sys.stderr.write(_('Could not encode: "%s"') % (s+"\n")) raise diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index ce2dae50..6c29c726 100644 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -108,14 +108,14 @@ def get_config(file_name, fallback = True): try: shutil.copyfile(example_path, config_path) example_copy = True - msg = _("Config file has been created at %s.\n") % config_path + msg = _("Config file has been created at %s.") % (config_path+"\n") logging.info(msg) except IOError: try: example_path = file_name + '.example' shutil.copyfile(example_path, config_path) example_copy = True - msg = _("Config file has been created at %s.\n") % config_path + msg = _("Config file has been created at %s.") % (config_path+"\n") logging.info(msg) except IOError: pass @@ -130,7 +130,7 @@ def get_config(file_name, fallback = True): shutil.copyfile(example_path, config_path) example_copy = True msg = _("No %s found\n in %s\n or %s\n") % (file_name, exec_dir, default_dir) \ - + _("Config file has been created at %s.\n") % config_path + + _("Config file has been created at %s.") % (config_path+"\n") print msg logging.info(msg) except: diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index fb1473e9..c92fff40 100755 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -2976,7 +2976,7 @@ if __name__=="__main__": hero = db_connection.get_player_id(c, 'PokerStars', 'nutOmatic') if hero: - print _("nutOmatic is id_player = %d") % hero + print "nutOmatic player_id", hero # example of displaying query plan in sqlite: if db_connection.backend == 4: diff --git a/pyfpdb/EverestToFpdb.py b/pyfpdb/EverestToFpdb.py index ee7e2135..c05ff9e1 100644 --- a/pyfpdb/EverestToFpdb.py +++ b/pyfpdb/EverestToFpdb.py @@ -105,7 +105,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) + raise FpdbParseError(_("Unable to recognise hand info from: '%s'") % tmp) self.info = {} mg = m.groupdict() @@ -231,8 +231,8 @@ class Everest(HandHistoryConverter): elif action.group('ATYPE') in ('FOLD', 'SIT_OUT'): hand.addFold(street, player) else: - print (_("Unimplemented readAction: '%s' '%s'") % (action.group('PSEAT'), action.group('ATYPE'))) - logging.debug(_("Unimplemented readAction: '%s' '%s'") % (action.group('PSEAT'), action.group('ATYPE'))) + print (_("Unimplemented %s: '%s' '%s'") % ("readAction", action.group('PSEAT'), action.group('ATYPE'))) + logging.debug(_("Unimplemented %s: '%s' '%s'") % ("readAction", action.group('PSEAT'), action.group('ATYPE'))) def readShowdownActions(self, hand): for shows in self.re_ShowdownAction.finditer(hand.handText): diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py index a9a9f179..d630b240 100644 --- a/pyfpdb/EverleafToFpdb.py +++ b/pyfpdb/EverleafToFpdb.py @@ -271,7 +271,7 @@ or None if we fail to get the info """ def readStudPlayerCards(self, hand, street): - logging.warning(_("Everleaf cannot read all stud/razz hands yet.")) + logging.warning(_("%s cannot read all stud/razz hands yet.") % hand.sitename) def readAction(self, hand, street): @@ -292,7 +292,7 @@ or None if we fail to get the info """ elif action.group('ATYPE') == ' complete to': hand.addComplete( street, action.group('PNAME'), action.group('BET')) else: - logging.debug(_("Unimplemented readAction: '%s' '%s'") % (action.group('PNAME'), action.group('ATYPE'))) + logging.debug(_("Unimplemented %s: '%s' '%s'") % ("readAction", action.group('PNAME'), action.group('ATYPE'))) def readShowdownActions(self, hand): @@ -301,7 +301,7 @@ or None if we fail to get the info """ for shows in self.re_ShowdownAction.finditer(hand.handText): cards = shows.group('CARDS') cards = cards.split(', ') - logging.debug(_("readShowdownActions %s %s") % (cards, shows.group('PNAME'))) + logging.debug("readShowdownActions %s %s" % (cards, shows.group('PNAME'))) hand.addShownCards(cards, shows.group('PNAME')) diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py index 6d36a69f..a7a904fc 100644 --- a/pyfpdb/Filters.py +++ b/pyfpdb/Filters.py @@ -77,7 +77,7 @@ class Filters(threading.Thread): self.mainVBox = gtk.VBox(False, 0) self.sw.add_with_viewport(self.mainVBox) self.sw.show() - print(_("DEBUG: ") + _("New packing box created!")) + #print(_("DEBUG:") + _("New packing box created!")) self.found = {'nl':False, 'fl':False, 'pl':False, 'cn':False, 'ring':False, 'tour':False} self.label = {} diff --git a/pyfpdb/FulltiltToFpdb.py b/pyfpdb/FulltiltToFpdb.py index e3809d95..e4f1d816 100755 --- a/pyfpdb/FulltiltToFpdb.py +++ b/pyfpdb/FulltiltToFpdb.py @@ -264,9 +264,9 @@ class Fulltilt(HandHistoryConverter): m = self.re_HandInfo.search(hand.handText) if m is None: tmp = hand.handText[0:100] - log.error(_("Unable to recognise handinfo from: '%s'") % tmp) + log.error(_("Unable to recognise hand info from: '%s'") % tmp) log.error("readHandInfo: " + _("Raising FpdbParseError")) - raise FpdbParseError(_("Unable to recognise handinfo from: '%s'")) + raise FpdbParseError(_("Unable to recognise hand info from: '%s'")) #print "DEBUG: m.groupdict: %s" % m.groupdict() hand.handid = m.group('HID') @@ -440,7 +440,7 @@ class Fulltilt(HandHistoryConverter): hand.buttonpos = int(self.re_Button.search(hand.handText).group('BUTTON')) except AttributeError, e: # FTP has no indication that a hand is cancelled. - raise FpdbParseError(_("readButton: Failed to detect button (hand #%s cancelled?)") % hand.handid) + raise FpdbParseError(_("%s Failed to detect button (hand #%s cancelled?)") % ("readButton:", hand.handid)) def readHeroCards(self, hand): # streets PREFLOP, PREDRAW, and THIRD are special cases beacause @@ -498,7 +498,7 @@ class Fulltilt(HandHistoryConverter): elif action.group('ATYPE') == ' stands pat': hand.addStandsPat( street, action.group('PNAME'), action.group('CARDS')) else: - print (_("DEBUG: ") + " " + _("Unimplemented readAction: '%s' '%s'") % (action.group('PNAME'), action.group('ATYPE'))) + print (_("DEBUG:") + " " + _("Unimplemented %s: '%s' '%s'") % ("readAction", action.group('PNAME'), action.group('ATYPE'))) def readShowdownActions(self, hand): diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py index 3afa1bad..2596a05b 100755 --- a/pyfpdb/GuiAutoImport.py +++ b/pyfpdb/GuiAutoImport.py @@ -200,7 +200,7 @@ class GuiAutoImport (threading.Thread): for site in the_sites: params = self.config.get_site_parameters(site) if params['enabled'] == True: - print (_("DEBUG: ") + _("Detecting hh directory for site: '%s'") % site) + print (_("DEBUG:") + " " + _("Detecting hand history directory for site: '%s'") % site) if os.name == 'posix': if self.posix_detect_hh_dirs(site): #data[1].set_text(dia_chooser.get_filename()) @@ -240,7 +240,7 @@ class GuiAutoImport (threading.Thread): # - Ideally we want to release the lock if the auto-import is killed by some # kind of exception - is this possible? if self.settings['global_lock'].acquire(wait=False, source="AutoImport"): # returns false immediately if lock not acquired - self.addText(_("\nGlobal lock taken ... Auto Import Started.\n")) + self.addText("\n" + _("Global lock taken ... Auto Import Started.")+"\n") self.doAutoImportBool = True self.startButton.set_label(_(u'Stop _Auto Import')) while gtk.events_pending(): # change the label NOW don't wait for the pipe to open diff --git a/pyfpdb/GuiPositionalStats.py b/pyfpdb/GuiPositionalStats.py index f1cba8de..0952f779 100644 --- a/pyfpdb/GuiPositionalStats.py +++ b/pyfpdb/GuiPositionalStats.py @@ -134,7 +134,7 @@ class GuiPositionalStats (threading.Thread): def toggleCallback(self, widget, data=None): # print "%s was toggled %s" % (data, ("OFF", "ON")[widget.get_active()]) self.activesite = data - print (_("DEBUG: ") + _("activesite set to %s") % (self.activesite)) + print (_("DEBUG:") + " " + _("activesite set to %s") % (self.activesite)) def refreshStats(self, widget, data): try: self.stats_vbox.destroy() diff --git a/pyfpdb/GuiStove.py b/pyfpdb/GuiStove.py index f1261a28..0f3b19c7 100644 --- a/pyfpdb/GuiStove.py +++ b/pyfpdb/GuiStove.py @@ -218,25 +218,25 @@ Against the range: { self.outputlabel.set_text(string) def set_board_flop(self, caller, widget): - print (_("DEBUG: ") + _("called set_board_flop: '%s' '%s'") % (caller ,widget)) + print (_("DEBUG:") + " " + _("called") + " set_board_flop: '%s' '%s'" % (caller ,widget)) self.boardtext = widget.get_text() def set_hero_cards_flop(self, caller, widget): - print (_("DEBUG: ") + _("called set_hero_cards_flop")) + print (_("DEBUG:") + " " + _("called") + " set_hero_cards_flop") self.herorange = widget.get_text() def set_villain_cards_flop(self, caller, widget): - print (_("DEBUG: ") + _("called set_villain_cards_flop")) + print (_("DEBUG:") + " " + _("called") + " set_villain_cards_flop") self.villainrange = widget.get_text() def update_flop_output_pane(self, caller, widget): - print (_("DEBUG: ") + _("called update_flop_output_pane")) + print (_("DEBUG:") + " " + _("called") + " update_flop_output_pane") self.stove.set_board_string(self.boardtext) self.stove.set_hero_cards_string(self.herorange) self.stove.set_villain_range_string(self.villainrange) - print (_("DEBUG: ") + ("odds_for_range")) + print (_("DEBUG:") + ("odds_for_range")) self.ev = Stove.odds_for_range(self.stove) - print (_("DEBUG: ") + ("set_output_label")) + print (_("DEBUG:") + " " + ("set_output_label")) self.set_output_label(self.ev.output) diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index 6dd09ba4..dfdfda58 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -488,8 +488,8 @@ If a player has None chips he won't be added.""" def checkPlayerExists(self,player): if player not in [p[1] for p in self.players]: - print (_("DEBUG: ") + _("checkPlayerExists: %s fail on hand number %s") % (player, self.handid)) - raise FpdbParseError(_("checkPlayerExists: %s fail on hand number %s") % (player, self.handid)) + print (_("DEBUG:") + " checkPlayerExists: " + _("%s fail on hand number %s") % (player, self.handid)) + raise FpdbParseError("checkPlayerExists: " + _("%s fail on hand number %s") % (player, self.handid)) def setCommunityCards(self, street, cards): log.debug("setCommunityCards %s %s" %(street, cards)) @@ -1706,7 +1706,7 @@ class Pot(object): if self.sym is None: self.sym = "C" if self.total is None: - print (_("DEBUG: ") + _("call Pot.end() before printing pot total")) + print (_("DEBUG:") + " " + _("call Pot.end() before printing pot total")) # NB if I'm sure end() is idempotent, call it here. raise FpdbParseError(_("Error in printing Hand object")) diff --git a/pyfpdb/ImapFetcher.py b/pyfpdb/ImapFetcher.py index f4b263bc..62d96e6f 100644 --- a/pyfpdb/ImapFetcher.py +++ b/pyfpdb/ImapFetcher.py @@ -41,7 +41,7 @@ def splitPokerStarsSummaries(summaryText): #TODO: this needs to go to PSS.py splitSummaries = re.split(re_SplitTourneys, summaryText) if len(splitSummaries) <= 1: - print (_("DEBUG: ") + _("re_SplitTourneys isn't matching")) + print (_("DEBUG:") + " " + _("re_SplitTourneys isn't matching")) return splitSummaries @@ -50,7 +50,7 @@ def splitFullTiltSummaries(summaryText):#TODO: this needs to go to FTPS.py splitSummaries = re.split(re_SplitTourneys, summaryText) if len(splitSummaries) <= 1: - print(_("DEBUG: ") + _("re_SplitTourneys isn't matching")) + print(_("DEBUG:") + " " + _("re_SplitTourneys isn't matching")) return splitSummaries diff --git a/pyfpdb/OnGameToFpdb.py b/pyfpdb/OnGameToFpdb.py index 1606438b..41b23afc 100755 --- a/pyfpdb/OnGameToFpdb.py +++ b/pyfpdb/OnGameToFpdb.py @@ -213,8 +213,8 @@ class OnGame(HandHistoryConverter): tzoffset = a.group('OFFSET') else: datetimestr = "2010/Jan/01 01:01:01" - log.error(_("readHandInfo: DATETIME not matched: '%s'") % info[key]) - print (_("DEBUG: ") + _("readHandInfo: DATETIME not matched: '%s'") % info[key]) + log.error("readHandInfo: " + _("DATETIME not matched: '%s'") % info[key]) + print (_("DEBUG:") + " readHandInfo: " + _("DATETIME not matched: '%s'") % info[key]) # TODO: Manually adjust time against OFFSET hand.startTime = datetime.datetime.strptime(datetimestr, "%Y/%b/%d %H:%M:%S") # also timezone at end, e.g. " ET" hand.startTime = HandHistoryConverter.changeTimezone(hand.startTime, tzoffset, "UTC") @@ -345,7 +345,7 @@ class OnGame(HandHistoryConverter): elif action.group('ATYPE') == ' stands pat': hand.addStandsPat( street, action.group('PNAME')) else: - print (_("DEBUG: ") + _("Unimplemented readAction: '%s' '%s'") % (action.group('PNAME'), action.group('ATYPE'))) + print (_("DEBUG:") + " " + _("Unimplemented %s: '%s' '%s'") % ("readAction", action.group('PNAME'), action.group('ATYPE'))) def readShowdownActions(self, hand): for shows in self.re_ShowdownAction.finditer(hand.handText): diff --git a/pyfpdb/PacificPokerToFpdb.py b/pyfpdb/PacificPokerToFpdb.py index b9c1b6f1..f0e51b4d 100644 --- a/pyfpdb/PacificPokerToFpdb.py +++ b/pyfpdb/PacificPokerToFpdb.py @@ -426,7 +426,7 @@ class PacificPoker(HandHistoryConverter): elif action.group('ATYPE') == ' stands pat': hand.addStandsPat( street, action.group('PNAME')) else: - print (_("DEBUG: ") + _("Unimplemented readAction: '%s' '%s'") % (action.group('PNAME'), action.group('ATYPE'))) + print (_("DEBUG:") + " " + _("Unimplemented %s: '%s' '%s'") % ("readAction", action.group('PNAME'), action.group('ATYPE'))) def readShowdownActions(self, hand): diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py index 20a0418c..9e880e5a 100755 --- a/pyfpdb/PartyPokerToFpdb.py +++ b/pyfpdb/PartyPokerToFpdb.py @@ -532,7 +532,7 @@ class PartyPoker(HandHistoryConverter): elif actionType == 'checks': hand.addCheck( street, playerName ) else: - raise FpdbParseError(_("Unimplemented readAction: '%s' '%s'") % (playerName,actionType), hid = hand.hid) + raise FpdbParseError(_("Unimplemented %s: '%s' '%s'") % ("readAction", playerName,actionType), hid = hand.hid) def readShowdownActions(self, hand): # all action in readShownCards diff --git a/pyfpdb/PkrToFpdb.py b/pyfpdb/PkrToFpdb.py index 731f877c..58eef1c6 100755 --- a/pyfpdb/PkrToFpdb.py +++ b/pyfpdb/PkrToFpdb.py @@ -348,7 +348,7 @@ class Pkr(HandHistoryConverter): elif action.group('ATYPE') == ' stands pat': hand.addStandsPat( street, action.group('PNAME')) else: - print (_("DEBUG: ") + _("Unimplemented readAction: '%s' '%s'") % (action.group('PNAME'), action.group('ATYPE'))) + print (_("DEBUG:") + _("Unimplemented %s: '%s' '%s'") % ("readAction", action.group('PNAME'), action.group('ATYPE'))) def readShowdownActions(self, hand): diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py index cd03474b..8d685df9 100644 --- a/pyfpdb/PokerStarsToFpdb.py +++ b/pyfpdb/PokerStarsToFpdb.py @@ -437,7 +437,7 @@ class PokerStars(HandHistoryConverter): elif action.group('ATYPE') == ' stands pat': hand.addStandsPat( street, action.group('PNAME'), action.group('CARDS')) else: - print (_("DEBUG: ") + _("Unimplemented readAction: '%s' '%s'") % (action.group('PNAME'), action.group('ATYPE'))) + print (_("DEBUG:") + " " + _("Unimplemented %s: '%s' '%s'") % ("readAction", action.group('PNAME'), action.group('ATYPE'))) def readShowdownActions(self, hand): diff --git a/pyfpdb/Win2dayToFpdb.py b/pyfpdb/Win2dayToFpdb.py index 952a49b4..7c7f8076 100755 --- a/pyfpdb/Win2dayToFpdb.py +++ b/pyfpdb/Win2dayToFpdb.py @@ -345,7 +345,7 @@ class Win2day(HandHistoryConverter): elif action.group('ATYPE') == 'ACTION_STAND': hand.addStandsPat( street, action.group('PNAME')) else: - print (_("DEBUG: ") + _("Unimplemented readAction: '%s' '%s'") % (action.group('PNAME'), action.group('ATYPE'))) + print (_("DEBUG:") + _("Unimplemented %s: '%s' '%s'") % ("readAction", action.group('PNAME'), action.group('ATYPE'))) def readShowdownActions(self, hand): diff --git a/pyfpdb/WinamaxToFpdb.py b/pyfpdb/WinamaxToFpdb.py index 89b702ef..aa586de0 100644 --- a/pyfpdb/WinamaxToFpdb.py +++ b/pyfpdb/WinamaxToFpdb.py @@ -403,7 +403,7 @@ class Winamax(HandHistoryConverter): elif action.group('ATYPE') == ' stands pat': hand.addStandsPat( street, action.group('PNAME')) else: - log.fatal(_("DEBUG: ") + _("Unimplemented readAction: '%s' '%s'") % (action.group('PNAME'), action.group('ATYPE'))) + log.fatal(_("DEBUG:") + _("Unimplemented %s: '%s' '%s'") % ("readAction", action.group('PNAME'), action.group('ATYPE'))) # print "Processed %s"%acts # print "committed=",hand.pot.committed diff --git a/pyfpdb/iPokerToFpdb.py b/pyfpdb/iPokerToFpdb.py index 3878bd8e..dedcb67a 100644 --- a/pyfpdb/iPokerToFpdb.py +++ b/pyfpdb/iPokerToFpdb.py @@ -258,7 +258,7 @@ or None if we fail to get the info """ #print "DEBUG: addBringIn(%s, %s)" %(action.group('PNAME'), action.group('BET')) hand.addBringIn(action.group('PNAME'), action.group('BET')) else: - logging.error(_("DEBUG: ") + _("Unimplemented readAction: '%s' '%s'") % (action.group('PNAME'), action.group('ATYPE'))) + logging.error(_("DEBUG:") + " " + _("Unimplemented %s: '%s' '%s'") % ("readAction", action.group('PNAME'), action.group('ATYPE'))) def readShowdownActions(self, hand): for shows in self.re_ShowdownAction.finditer(hand.handText): diff --git a/pyfpdb/test_Database.py b/pyfpdb/test_Database.py index a3071ef5..c23c0366 100644 --- a/pyfpdb/test_Database.py +++ b/pyfpdb/test_Database.py @@ -47,8 +47,8 @@ def testSQLiteVarianceFunction(): cur.execute("SELECT variance(i) from test") result = cur.fetchone()[0] - print (_("DEBUG: ") + _("Testing variance function")) - print (_("DEBUG: ") + _("result: %s expecting: 0.666666 (result-expecting ~= 0.0): %s") % (result, (result - 0.66666))) + print (_("DEBUG:") + " " + _("Testing variance function")) + print (_("DEBUG:") + " " + _("result: %s expecting: 0.666666 (result-expecting ~= 0.0): %s") % (result, (result - 0.66666))) cur.execute("DROP TABLE test") assert (result - 0.66666) <= 0.0001