Applied minor fix on logging

Author: dhondta

src/tinyscript/VERSION.txt

@@ -1 +1 @@
-1.30.28
+1.30.29

src/tinyscript/features/loglib.py

@@ -71,4 +71,5 @@ def configure_logger(glob, multi_level, relative=False, logfile=None, syslog=Fal
     coloredlogs.install(1, logger=lastrec, **kw)
     logging.configLogger(logger, dl, syslog=syslog, stream=logfile, relative=relative,
                          milliseconds=glob.get('TIME_MILLISECONDS', TIME_MILLISECONDS), **kw)
+    logger.propagate = False
 

src/tinyscript/helpers/common.py

@@ -14,7 +14,7 @@
                           "strings_from_file", "urlparse", "urlparse_query", "xor", "xor_file", "withrepr", "zeropad"]
 
 
-def human_readable_size(size, precision=0):
+def human_readable_size(size, precision=0, sep=" "):
     """ Convert size in bytes to a more readable form. """
     if not isinstance(size, (int, float)):
         raise ValueError("Bad size")
@@ -24,7 +24,7 @@ def human_readable_size(size, precision=0):
     while size > 1024 and i < len(units):
         i += 1
         size /= 1024.0
-    return "%.*f%s" % (precision, size, units[i])
+    return f"{size:.{precision}f}{sep}{units[i]}"
 
 
 def is_admin():
@@ -56,7 +56,7 @@ def __init__(self, *args):
         elif l == 3:
             self.start, self.stop, self.step = list(map(float, args))
         else:
-            raise TypeError("range2 expected at most 3 arguments, got %s" % l)
+            raise TypeError(f"range2 expected at most 3 arguments, got {l}")
 
     def __iter__(self):
         n_rnd, cursor = max(len(str(f).split(".")[1]) for f in [self.start, self.stop, self.step]), self.start
@@ -72,7 +72,7 @@ def __len__(self):
 
     def __repr__(self):
         v = [[self.start, self.stop], [self.start, self.stop, self.step]][self.step != 1.]
-        return "range(%s)" % ", ".join(map(str, v))
+        return f"range({', '.join(map(str, v))})"
 
     def count(self, value):
         """ return number of occurrences of value """
@@ -87,7 +87,7 @@ def index(self, value):
         for i, x in enumerate(self):
             if value == x:
                 return i
-        raise ValueError("%s is not in range" % str(value))
+        raise ValueError(f"{value} is not in range")
 builtins.range2 = range2object
 
 

src/tinyscript/preimports/log.py

@@ -143,11 +143,10 @@ def delLevelName(level):
     """ Remove association of 'levelName' with 'level'. """
     logging._acquireLock()
     if isinstance(level, int):
-        levelName = logging._levelToName[level] if PY3 else logging._levelNames[level]
+        levelName = logging._levelToName[level]
     else:
         levelName = level.upper()
-        level = logging._nameToLevel.get(levelName) if PY3 else \
-                {v: k for k, v in logging._levelNames.items()}.get(levelName)
+        level = logging._nameToLevel.get(levelName)
     __del(getattr(logging, "_levelToName", None), level)
     __del(getattr(logging, "_levelNames", None), level)
     __del(getattr(logging, "_nameToLevel", None), levelName)

tests/test_helpers_common.py

@@ -38,7 +38,7 @@ def test_common_utility_functions(self):
         self.assertEqual(r.count(.5), 0)
         self.assertEqual(r.index(.2), 2)
         self.assertRaises(ValueError, r.index, 1.1)
-        self.assertEqual(human_readable_size(123456), "121KB")
+        self.assertEqual(human_readable_size(123456), "121 KB")
         self.assertRaises(ValueError, human_readable_size, "BAD")
         self.assertRaises(ValueError, human_readable_size, -1)
         self.assertIsNotNone(is_admin())