Applied some minor fixes

Author: dhondta

src/tinyscript/helpers/fexec.py

@@ -60,7 +60,7 @@ def execute(cmd, **kwargs):
     return (out, err, p.returncode) if rc else (out, err)
 
 
-def execute_and_log(cmd, out_maxlen=256, silent=None, **kwargs):
+def execute_and_log(cmd, out_maxlen=256, silent=None, warn=None, **kwargs):
     """ Wrapper for subprocess.Popen, logging execution using the logger from kwargs or globals.
 
     :param cmd:        command string
@@ -80,7 +80,10 @@ def execute_and_log(cmd, out_maxlen=256, silent=None, **kwargs):
         if err:
             err = ensure_str(err).strip()
             if all(re.search(pattern, err) is None for pattern in (silent or [])):
-                (logger.warning if err.startswith("WARNING") else logger.error)(err)
+                if any(err.startswith(x) for x in ["WARNING ", "[WARNING] ", "(WARNING) ", "{WARNING} "]):
+                    logger.warning(err.split(" ", 1)[1])
+                else:
+                    (logger.warning if any(re.search(p, err) is None for p in (warn or [])) else logger.error)(err)
     return out, err, retc
 
 

src/tinyscript/preimports/stringp.py

@@ -11,12 +11,12 @@
 
 def _natural_key(case_sensitive=False):
     """ Key computation function for considering keys in a natural way.
-    
+
     :param text: text to be used for computing the key
     """
     def _wrapper(text):
-        return [(0, int(t)) if t.isdigit() else (1, t if case_sensitive else t.lower()) for t in \
-                re.split(r"(\d+|\D+)", text)]
+        return [(0, int(t)) if t.lstrip("-").isdigit() else (1, t if case_sensitive else t.lower()) for t in \
+                re.split(r"(\-?(?:\d+|\D+))", text)]
     return _wrapper
 string.natural_key = _natural_key
 

tests/test_preimports_string.py

@@ -20,4 +20,5 @@ def test_extra_string_functions(self):
         string.sort_natural(l)
         self.assertEqual(tuple(LST), tuple(l))
         self.assertEqual(tuple(LST), tuple(string.sorted_natural(l)))
+        self.assertEqual(tuple(string.sorted_natural(["1", "A", "-1"])), ("-1", "1", "A"))