0003428: When running with pythonw.exe, Windows may crash if you write to stdout. Some more print statements changed to log.warning.
svn: r21510
This commit is contained in:
		@@ -23,6 +23,12 @@
 | 
			
		||||
"""
 | 
			
		||||
Class handling language-specific selection for date parser and displayer.
 | 
			
		||||
"""
 | 
			
		||||
#-------------------------------------------------------------------------
 | 
			
		||||
#
 | 
			
		||||
# set up logging
 | 
			
		||||
#
 | 
			
		||||
#-------------------------------------------------------------------------
 | 
			
		||||
import logging
 | 
			
		||||
 | 
			
		||||
# import prerequisites for localized handlers
 | 
			
		||||
from _DateHandler import (LANG, LANG_SHORT, LANG_TO_PARSER, LANG_TO_DISPLAY, 
 | 
			
		||||
@@ -57,7 +63,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
 | 
			
		||||
@@ -73,7 +79,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)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -31,6 +31,13 @@ Option class representing an enumerated list of possible values.
 | 
			
		||||
#-------------------------------------------------------------------------
 | 
			
		||||
from gen.plug.menu import Option
 | 
			
		||||
 | 
			
		||||
#-------------------------------------------------------------------------
 | 
			
		||||
#
 | 
			
		||||
# set up logging
 | 
			
		||||
#
 | 
			
		||||
#-------------------------------------------------------------------------
 | 
			
		||||
import logging
 | 
			
		||||
 | 
			
		||||
#-------------------------------------------------------------------------
 | 
			
		||||
#
 | 
			
		||||
# EnumeratedListOption class
 | 
			
		||||
@@ -113,5 +120,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()})
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user