Commit 806e5dcd authored by Michiel Cottaar's avatar Michiel Cottaar
Browse files

REF: recalled _prepareArgs as prepareArgs

parent fac47610
...@@ -104,7 +104,7 @@ def submit(*command, ...@@ -104,7 +104,7 @@ def submit(*command,
:return: string of submitted job id :return: string of submitted job id
""" """
from fsl.utils.run import runfsl, _prepareArgs from fsl.utils.run import runfsl, prepareArgs
base_cmd = ['fsl_sub'] base_cmd = ['fsl_sub']
...@@ -135,7 +135,7 @@ def submit(*command, ...@@ -135,7 +135,7 @@ def submit(*command,
base_cmd.append('-s') base_cmd.append('-s')
base_cmd.extend(multi_threaded) base_cmd.extend(multi_threaded)
base_cmd.extend(_prepareArgs(command)) base_cmd.extend(prepareArgs(command))
return runfsl(*base_cmd).strip() return runfsl(*base_cmd).strip()
......
...@@ -72,7 +72,7 @@ def dryrun(*args): ...@@ -72,7 +72,7 @@ def dryrun(*args):
DRY_RUN = oldval DRY_RUN = oldval
def _prepareArgs(args): def prepareArgs(args):
"""Used by the :func:`run` function. Ensures that the given arguments is a """Used by the :func:`run` function. Ensures that the given arguments is a
list of strings. list of strings.
""" """
...@@ -179,7 +179,7 @@ def run(*args, **kwargs): ...@@ -179,7 +179,7 @@ def run(*args, **kwargs):
logStdout = log .get('stdout', None) logStdout = log .get('stdout', None)
logStderr = log .get('stderr', None) logStderr = log .get('stderr', None)
logCmd = log .get('cmd', None) logCmd = log .get('cmd', None)
args = _prepareArgs(args) args = prepareArgs(args)
if not bool(submit): if not bool(submit):
submit = None submit = None
...@@ -345,7 +345,7 @@ def runfsl(*args, **kwargs): ...@@ -345,7 +345,7 @@ def runfsl(*args, **kwargs):
if not prefixes: if not prefixes:
raise FSLNotPresent('$FSLDIR is not set - FSL cannot be found!') raise FSLNotPresent('$FSLDIR is not set - FSL cannot be found!')
args = _prepareArgs(args) args = prepareArgs(args)
for prefix in prefixes: for prefix in prefixes:
cmdpath = op.join(prefix, args[0]) cmdpath = op.join(prefix, args[0])
if op.isfile(cmdpath): if op.isfile(cmdpath):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment