diff options
| author | Lars Wirzenius <liw@liw.fi> | 2017-01-26 21:39:19 +0200 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2017-01-26 21:39:19 +0200 |
| commit | ddbec5d0874305787ba3a0f1ba9852699df01751 (patch) | |
| tree | 38c4ce26cbdc34823c36a94b961cf336972f96ea | |
| parent | 8ccdadfeb04877d9c0758d635f87964b62b50bc7 (diff) | |
| download | cliapp-ddbec5d0874305787ba3a0f1ba9852699df01751.tar.gz | |
Add (unimplemented) output_timeout kwarg to runcmd
| -rw-r--r-- | cliapp/runcmd.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cliapp/runcmd.py b/cliapp/runcmd.py index 9d207f6..f434030 100644 --- a/cliapp/runcmd.py +++ b/cliapp/runcmd.py @@ -94,6 +94,7 @@ def runcmd_unchecked(argv, *argvs, **kwargs): pipe_stderr = pop_kwarg('stderr', subprocess.PIPE) stdout_callback = pop_kwarg('stdout_callback', noop) stderr_callback = pop_kwarg('stderr_callback', noop) + output_timeout = pop_kwarg('output_timeout', None) try: pipeline = _build_pipeline(argvs, @@ -103,7 +104,8 @@ def runcmd_unchecked(argv, *argvs, **kwargs): kwargs) return _run_pipeline(pipeline, feed_stdin, pipe_stdin, pipe_stdout, pipe_stderr, - stdout_callback, stderr_callback) + stdout_callback, stderr_callback, + output_timeout) except OSError, e: # pragma: no cover if e.errno == errno.ENOENT and e.filename is None: e.filename = argv[0] @@ -160,7 +162,7 @@ def _build_pipeline(argvs, pipe_stdin, pipe_stdout, pipe_stderr, kwargs): def _run_pipeline(procs, feed_stdin, pipe_stdin, pipe_stdout, pipe_stderr, - stdout_callback, stderr_callback): + stdout_callback, stderr_callback, output_timeout): stdout_eof = False stderr_eof = False |