kkpyutil 1.28.2__tar.gz → 1.29.1__tar.gz

{kkpyutil-1.28.2 → kkpyutil-1.29.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: kkpyutil
-Version: 1.28.2
+Version: 1.29.1
 Summary: Building blocks for sysadmin and DevOps
 Home-page: https://github.com/kakyoism/kkpyutil/
 License: MIT

{kkpyutil-1.28.2 → kkpyutil-1.29.1}/kkpyutil.py

@@ -1058,7 +1058,7 @@ def run_cmd(cmd, cwd=None, logger=None, check=True, shell=False, verbose=False,
     console_info = logger.info if logger and verbose else logger.debug
     # show cmdline with or without exceptions
     cmd_log = f"""\
-{' '.join(cmd)}
+{' '.join([str(comp) for comp in cmd])}
 cwd: {osp.abspath(cwd) if cwd else os.getcwd()}
 """
     logger.info(cmd_log)
@@ -1103,7 +1103,7 @@ def run_daemon(cmd, cwd=None, logger=None, shell=False, useexception=True, env=N
     """
     logger = logger or glogger
     logger.debug(f"""run in background:
-{" ".join(cmd)}
+{' '.join([str(comp) for comp in cmd])}
 cwd: {osp.abspath(cwd) if cwd else os.getcwd()}
 """)
     # fake the same proc interface
@@ -1139,7 +1139,7 @@ def watch_cmd(cmd, cwd=None, logger=None, shell=False, verbose=False, useexcepti
     logger = logger or glogger
     # show cmdline with or without exceptions
     cmd_log = f"""\
-{' '.join(cmd)}
+{' '.join([str(comp) for comp in cmd])}
 cwd: {osp.abspath(cwd) if cwd else os.getcwd()}
 """
     logger.info(cmd_log)
@@ -2780,13 +2780,15 @@ def merge_namespaces(to_ns: types.SimpleNamespace, from_ns: types.SimpleNamespac
     return to_ns
 
 
-def thread_timeout(seconds):
+def thread_timeout(seconds, bypass=False):
     """
     - for single-process function only
     - will not work if decorated function spawns subprocesses
     """
     def decorator(func):
         def wrapper(*args, **kwargs):
+            if bypass:
+                return func(*args, **kwargs)
             # Create a thread to run the function
             thread = threading.Thread(target=func, args=args, kwargs=kwargs)
             thread.start()
@@ -2810,11 +2812,13 @@ def _run_container(func, cont_queue, args, kwargs):
         cont_queue.put(e)
 
 
-def process_timeout(seconds):
+def process_timeout(seconds, bypass=False):
     def decorator(func):
         func_name = f'{func.__module__}.{func.__name__}'
 
         def wrapper(*args, **kwargs):
+            if bypass:
+                return func(*args, **kwargs)
             # Create a thread to run the function
             cont_queue = multiprocessing.Queue()
             proc = multiprocessing.Process(target=_run_container, args=(func_name, cont_queue, args,), kwargs=kwargs)

{kkpyutil-1.28.2 → kkpyutil-1.29.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "kkpyutil"
-version = "1.28.2"
+version = "1.29.1"
 description = "Building blocks for sysadmin and DevOps"
 authors = ["Beinan Li <li.beinan@gmail.com>"]
 maintainers = ["Beinan Li <li.beinan@gmail.com>"]