From 98fa69b717666d44aeb90f55bd98237cfef9eda9 Mon Sep 17 00:00:00 2001 From: Tim G L Lyons Date: Fri, 1 Mar 2013 13:12:29 +0000 Subject: [PATCH] 0003428: When running with pythonw.exe, Windows may crash if you write to stdout. Some more print statements changed to log.warning. svn: r21511 --- gramps/gen/datehandler/__init__.py | 13 ++++++++++--- gramps/gen/plug/menu/_enumeratedlist.py | 13 +++++++++++-- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/gramps/gen/datehandler/__init__.py b/gramps/gen/datehandler/__init__.py index a08b11931..84fca6713 100644 --- a/gramps/gen/datehandler/__init__.py +++ b/gramps/gen/datehandler/__init__.py @@ -24,8 +24,15 @@ Class handling language-specific selection for date parser and displayer. """ -from __future__ import print_function +#------------------------------------------------------------------------- +# +# set up logging +# +#------------------------------------------------------------------------- +import logging +from ..const import GRAMPS_LOCALE as glocale +_ = glocale.get_translation().sgettext # import prerequisites for localized handlers from ._datehandler import (LANG, LANG_SHORT, LANG_TO_PARSER, LANG_TO_DISPLAY, register_datehandler) @@ -59,7 +66,7 @@ try: else: parser = LANG_TO_PARSER[LANG_SHORT]() except: - print("Date parser for", LANG, "not available, using default") + logging.warning(_("Date parser for '%s' not available, using default") % LANG) parser = LANG_TO_PARSER["C"]() # Initialize global displayer @@ -75,7 +82,7 @@ try: else: displayer = LANG_TO_DISPLAY[LANG_SHORT](val) except: - print("Date displayer for", LANG, "not available, using default") + logging.warning(_("Date displayer for '%s' not available, using default") % LANG) displayer = LANG_TO_DISPLAY["C"](val) diff --git a/gramps/gen/plug/menu/_enumeratedlist.py b/gramps/gen/plug/menu/_enumeratedlist.py index c4f26fc5e..ccc3991d8 100644 --- a/gramps/gen/plug/menu/_enumeratedlist.py +++ b/gramps/gen/plug/menu/_enumeratedlist.py @@ -32,6 +32,15 @@ Option class representing an enumerated list of possible values. from __future__ import print_function from . import Option +from gramps.gen.const import GRAMPS_LOCALE as glocale +_ = glocale.get_translation().sgettext + +#------------------------------------------------------------------------- +# +# set up logging +# +#------------------------------------------------------------------------- +import logging #------------------------------------------------------------------------- # @@ -115,5 +124,5 @@ class EnumeratedListOption(Option): if value in (v for v, d in self.__items): Option.set_value(self, value) else: - print("Value '%s' not found for option '%s'" % (str(value), - self.get_label())) + logging.warning(_("Value '%(val)s' not found for option '%(opt)s'") % + {'val' : str(value), 'opt' : self.get_label()})