ssh_support + log: fixes for python 2 compatibility

1 files changed, 7 insertions, 8 deletions

diff --git a/rumba/log.py b/rumba/log.py
index d95c034..bed0170 100644
--- a/rumba/log.py
+++ b/rumba/log.py
@@ -40,9 +40,8 @@ class RumbaFormatter(logging.Formatter):
 
     def __init__(self):
         super(RumbaFormatter, self).__init__(
-            fmt='{asctime} | {levelname:3.3} | '
-                '{name:11.11} | {message}',
-            style='{',
+            fmt='%(asctime)s | %(levelname)3.3s | '
+                '%(name)11.11s | %(message)s',
             datefmt='%H:%M:%S')
 
     def format(self, record):
@@ -95,11 +94,11 @@ def set_logging_level(level, name=None):
     """
     Set the current logging level to <level> for logger named <name>.
     If name is not specified, sets the logging level for all rumba loggers.
-    Accepted levels are: 
-        DEBUG == 10, 
-        INFO == 20, 
-        WARNING == 30, 
-        ERROR == 40, 
+    Accepted levels are:
+        DEBUG == 10,
+        INFO == 20,
+        WARNING == 30,
+        ERROR == 40,
         CRITICAL == 50,
         NOTSET == 0
     (resets the logger: its level is set to the default or its parents' level)