openstack/oslo.concurrency
Code Issues Proposed changes

Merge "Allow python_exec kwarg to be None"

Browse Source
This commit is contained in:
Zuul 2022-04-05 12:04:56 +00:00 committed by Gerrit Code Review
commit 5d17e5fb44
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oslo_concurrency/processutils.py
View File

@ -269,8 +269,8 @@ def execute(*cmd, **kwargs):
below for a detailed description. below for a detailed description.
:type prlimit: :class:`ProcessLimits` :type prlimit: :class:`ProcessLimits`
:param python_exec: The python executable to use for enforcing :param python_exec: The python executable to use for enforcing
prlimits. If this is not set it will default to use prlimits. If this is not set or is None, it will
sys.executable. default to use sys.executable.
:type python_exec: string :type python_exec: string
:param timeout: Timeout (in seconds) to wait for the process :param timeout: Timeout (in seconds) to wait for the process
termination. If timeout is reached, termination. If timeout is reached,
@ -329,7 +329,7 @@ def execute(*cmd, **kwargs):
on_completion = kwargs.pop('on_completion', None) on_completion = kwargs.pop('on_completion', None)
preexec_fn = kwargs.pop('preexec_fn', None) preexec_fn = kwargs.pop('preexec_fn', None)
prlimit = kwargs.pop('prlimit', None) prlimit = kwargs.pop('prlimit', None)
python_exec = kwargs.pop('python_exec', sys.executable) python_exec = kwargs.pop('python_exec', None) or sys.executable
timeout = kwargs.pop('timeout', None) timeout = kwargs.pop('timeout', None)
if isinstance(check_exit_code, bool): if isinstance(check_exit_code, bool):