From a3fc1996c0f4552f7cbeb475707d352e69bae391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Ma=C5=9Blanka?= <piotr.maslanka@henrietta.com.pl> Date: Wed, 29 Apr 2020 16:29:01 +0200 Subject: [PATCH] 2.7.16 --- satella/__init__.py | 2 +- satella/processes.py | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/satella/__init__.py b/satella/__init__.py index 10939f77..f92ee80e 100644 --- a/satella/__init__.py +++ b/satella/__init__.py @@ -1 +1 @@ -__version__ = '2.7.16_a4' +__version__ = '2.7.16' diff --git a/satella/processes.py b/satella/processes.py index cd9a431a..af56d190 100644 --- a/satella/processes.py +++ b/satella/processes.py @@ -30,28 +30,23 @@ def call_and_return_stdout(args: tp.Union[str, tp.List[str]], within this time, it will be sent a SIGKILL :param expected_return_code: an expected return code of this process. 0 is the default. If process returns anything else, ProcessFailed will be raise - :param ProcessFailed: process' result code was different from the requested + :raises ProcessFailed: process' result code was different from the requested """ if isinstance(args, str): args = args.split(' ') - logger.warning('Modifying kwargs') kwargs['stdout'] = subprocess.PIPE stdout_list = [] - logger.warning('Starting popen') proc = subprocess.Popen(args, **kwargs) reader_thread = threading.Thread(target=read_nowait, args=(proc, stdout_list), daemon=True) - logger.warning('Starting rt') reader_thread.start() - logger.warning('Waiting for termination') try: proc.wait(timeout=timeout) except subprocess.TimeoutExpired: proc.kill() proc.wait() - logger.warning('Terminated') if proc.returncode != expected_return_code: raise ProcessFailed(proc.returncode) -- GitLab