From 8c5f54fbda74b7943ffd09a9629a03ff204a7345 Mon Sep 17 00:00:00 2001
From: Martin Craig <martin.craig@eng.ox.ac.uk>
Date: Tue, 10 Jul 2018 10:46:41 +0100
Subject: [PATCH] Remove all standard keyword argument and pass them to the run
function separately
---
fsl/wrappers/wrapperutils.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/fsl/wrappers/wrapperutils.py b/fsl/wrappers/wrapperutils.py
index 562bbba7d..39339e18f 100644
--- a/fsl/wrappers/wrapperutils.py
+++ b/fsl/wrappers/wrapperutils.py
@@ -141,11 +141,13 @@ def cmdwrapper(func):
:func:`fsl.utils.run.run` function in a standardised manner.
"""
def wrapper(*args, **kwargs):
+ stdout = kwargs.pop('stdout', True)
+ stderr = kwargs.pop('stderr', False)
+ exitcode = kwargs.pop('exitcode', False)
submit = kwargs.pop('submit', None)
- stderr = kwargs.pop('stderr', True)
log = kwargs.pop('log', {'tee' : True})
cmd = func(*args, **kwargs)
- return run.run(cmd, stderr=stderr, log=log, submit=submit)
+ return run.run(cmd, stderr=stderr, log=log, submit=submit, stdout=stdout, exitcode=exitcode)
return _update_wrapper(wrapper, func)
@@ -155,11 +157,13 @@ def fslwrapper(func):
:func:`fsl.utils.run.runfsl` function in a standardised manner.
"""
def wrapper(*args, **kwargs):
+ stdout = kwargs.pop('stdout', True)
+ stderr = kwargs.pop('stderr', False)
+ exitcode = kwargs.pop('exitcode', False)
submit = kwargs.pop('submit', None)
- stderr = kwargs.pop('stderr', True)
log = kwargs.pop('log', {'tee' : True})
cmd = func(*args, **kwargs)
- return run.runfsl(cmd, stderr=stderr, log=log, submit=submit)
+ return run.runfsl(cmd, stderr=stderr, log=log, submit=submit, stdout=stdout, exitcode=exitcode)
return _update_wrapper(wrapper, func)
--
GitLab