Remove some duplicate code. Also beautified some parts.

Author: SebiSebi

friendlylog/colored_logger.py

@@ -3,29 +3,33 @@
 
 from colored import fg, attr
 from copy import copy
+from friendlylog.constants import (
+        DEBUG,
+        INFO,
+        WARNING,
+        ERROR,
+        CRITICAL,
+
+        LOG_LEVEL_LIST
+)
 from friendlylog.utils import do_not_propagate
 
 
 # Where the logs should be sent.
 _STREAM = sys.stdout
 
+
 class _ColoredFormatter(logging.Formatter):
 
     def __init__(self, *args, **kwargs):
         super(_ColoredFormatter, self).__init__(*args, **kwargs)
 
     @staticmethod
     def _colorize(msg, loglevel):
-        DEBUG = "debug"
-        INFO = "info"
-        WARNING = "warning"
-        ERROR = "error"
-        CRITICAL = "critical"
-
         loglevel = str(loglevel).lower()
-        if loglevel not in [DEBUG, INFO, WARNING, ERROR, CRITICAL]:
+        if loglevel not in LOG_LEVEL_LIST:
             raise RuntimeError("{} should be oneof {}.".format(
-                loglevel, [DEBUG, INFO, WARNING, ERROR, CRITICAL]))  # pragma: no cover
+                loglevel, LOG_LEVEL_LIST))  # pragma: no cover
         msg = str(loglevel).upper() + ": " + str(msg)
 
         if loglevel == DEBUG:
@@ -37,7 +41,7 @@ def _colorize(msg, loglevel):
         if loglevel == ERROR:
             return "{}{}{}{}{}".format(fg(202), attr(1), msg, attr(21), attr(0))  # noqa: E501
         if loglevel == CRITICAL:
-            return "{}{}{}{}{}".format(fg(196), attr(1), msg, attr(21), attr(0))
+            return "{}{}{}{}{}".format(fg(196), attr(1), msg, attr(21), attr(0))  # noqa: E501
 
     def format(self, record):
         record = copy(record)

friendlylog/constants.py

@@ -0,0 +1,7 @@
+DEBUG = "debug"
+INFO = "info"
+WARNING = "warning"
+ERROR = "error"
+CRITICAL = "critical"
+
+LOG_LEVEL_LIST = [DEBUG, INFO, WARNING, ERROR, CRITICAL]

friendlylog/simple_logger.py

@@ -2,32 +2,28 @@
 import sys
 
 from copy import copy
+from friendlylog.constants import (
+        LOG_LEVEL_LIST
+)
 from friendlylog.utils import do_not_propagate
 
 
 # Where the logs should be sent.
 _STREAM = sys.stdout
 
+
 class _SimpleFormatter(logging.Formatter):
 
     def __init__(self, *args, **kwargs):
         super(_SimpleFormatter, self).__init__(*args, **kwargs)
 
     @staticmethod
     def _process(msg, loglevel):
-        DEBUG = "debug"
-        INFO = "info"
-        WARNING = "warning"
-        ERROR = "error"
-        CRITICAL = "critical"
-
         loglevel = str(loglevel).lower()
-        if loglevel not in [DEBUG, INFO, WARNING, ERROR, CRITICAL]:
+        if loglevel not in LOG_LEVEL_LIST:
             raise RuntimeError("{} should be oneof {}.".format(
-                loglevel, [DEBUG, INFO, WARNING, ERROR, CRITICAL]))  # pragma: no cover
-        msg = str(loglevel).upper() + ": " + str(msg)
-
-        return msg
+                loglevel, LOG_LEVEL_LIST))  # pragma: no cover
+        return str(loglevel).upper() + ": " + str(msg)
 
     def format(self, record):
         record = copy(record)