sat launcher : nouvelle option -p qui permet de générer un lanceur pour un sous ensem...

[tools/sat.git] / src / loggingSimple.py

diff --git a/src/loggingSimple.py b/src/loggingSimple.py
index 7073e4d5882becbce8c832c7817057b0f731fb95..177b3426f2bf67dea058be8d2933518fc663c6dd 100755 (executable)
--- a/src/loggingSimple.py
+++ b/src/loggingSimple.py
@@ -117,7 +117,8 @@ def getStrHandler(handler):
   h = handler  # shortcut
   msg = "%s(name=%s)"
   cName = h.__class__.__name__
-  res = msg % (cName, h.get_name())
+  # get_name absent in logging 0.5.0.5 python 2.6
+  res = msg % (cName, h._name)
   return res
 
 
@@ -189,7 +190,7 @@ LOGI.LogRecord.getMessage = getMessage  # better message if error
 
 
 #################################################################
-class LoggerSimple(LOGI.Logger):
+class LoggerSimple(LOGI.Logger, object): # object force new-style classes in logging 0.5.0.5 python 2.6
   """
   Inherited class logging.Logger for logger salomeTools
 
@@ -264,7 +265,7 @@ class LoggerSimple(LOGI.Logger):
 
 
 #################################################################
-class UnittestFormatter(LOGI.Formatter):
+class UnittestFormatter(LOGI.Formatter, object): # object force new-style classes in logging 0.5.0.5 python 2.6
   """
   this formatter prefixes level name and indents all messages
   """
@@ -276,7 +277,7 @@ class UnittestFormatter(LOGI.Formatter):
     return res
 
 #################################################################
-class DefaultFormatter(LOGI.Formatter):
+class DefaultFormatter(LOGI.Formatter, object): # object force new-style classes in logging 0.5.0.5 python 2.6
   """
   this formatter prefixes level name and indents all messages but INFO stay "as it"
   """
@@ -325,7 +326,7 @@ class UnittestStream(object):
 
 
 #################################################################
-class StreamHandlerSimple(LOGI.StreamHandler):
+class StreamHandlerSimple(LOGI.StreamHandler, object): # object force new-style classes in logging 0.5.0.5 python 2.6
   """
   A handler class which writes logging records, appropriately formatted,
   to a stream. Note that this class does not close the stream, as
@@ -394,7 +395,8 @@ def initLoggerAsDefault(logger, fmt=None, level=None):
   log("initLoggerAsDefault name=%s\nfmt='%s' level='%s'" % (logger.name, fmt, level))
   #handler = StreamHandlerSimple(sys.stdout)  # Logging vers console
   handler = LOGI.StreamHandler(sys.stdout)  # Logging vers console
-  handler.set_name(logger.name + "_console")
+  # set_name absent in logging 0.5.0.5 python 2.6
+  handler._name = logger.name + "_console"
   if fmt is not None:
     # formatter = UnittestFormatter(fmt, "%y-%m-%d %H:%M:%S")
     formatter = DefaultFormatter(fmt, "%y-%m-%d %H:%M:%S")
@@ -410,7 +412,7 @@ def initLoggerAsDefault(logger, fmt=None, level=None):
   if level is not None:  # level could be modified during execution
     handler.setLevel(level)  # on screen log as user wants
   else:
-    handler.setLevel(LOGI.STEP)  # on screen no log step, which are in xml files
+    handler.setLevel(LOGI.INFO)  # on screen no log step, which are in xml files
   return
 
 
@@ -423,7 +425,8 @@ def initLoggerAsUnittest(logger, fmt=None, level=None):
   log("initLoggerAsUnittest name=%s\nfmt='%s' level='%s'" % (logger.name, fmt, level))
   stream = UnittestStream()
   handler = LOGI.StreamHandler(stream)  # Logging vers stream
-  handler.set_name(logger.name + "_unittest")
+  # set_name absent in logging 0.5.0.5 python 2.6
+  handler._name = logger.name + "_unittest"
   if fmt is not None:
     # formatter = LOGI.Formatter(fmt, "%Y-%m-%d %H:%M:%S")
     formatter = UnittestFormatter(fmt, "%Y-%m-%d %H:%M:%S")