From 806e5dcdba1caaa96a6c267c516312fb51172ecb Mon Sep 17 00:00:00 2001 From: Michiel Cottaar <MichielCottaar@protonmail.com> Date: Thu, 19 Sep 2019 14:20:00 +0100 Subject: [PATCH] REF: recalled _prepareArgs as prepareArgs --- fsl/utils/fslsub.py | 4 ++-- fsl/utils/run.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fsl/utils/fslsub.py b/fsl/utils/fslsub.py index 81a1fc942..2037a87a9 100644 --- a/fsl/utils/fslsub.py +++ b/fsl/utils/fslsub.py @@ -104,7 +104,7 @@ def submit(*command, :return: string of submitted job id """ - from fsl.utils.run import runfsl, _prepareArgs + from fsl.utils.run import runfsl, prepareArgs base_cmd = ['fsl_sub'] @@ -135,7 +135,7 @@ def submit(*command, base_cmd.append('-s') base_cmd.extend(multi_threaded) - base_cmd.extend(_prepareArgs(command)) + base_cmd.extend(prepareArgs(command)) return runfsl(*base_cmd).strip() diff --git a/fsl/utils/run.py b/fsl/utils/run.py index 3fb7d979e..12cc03606 100644 --- a/fsl/utils/run.py +++ b/fsl/utils/run.py @@ -72,7 +72,7 @@ def dryrun(*args): DRY_RUN = oldval -def _prepareArgs(args): +def prepareArgs(args): """Used by the :func:`run` function. Ensures that the given arguments is a list of strings. """ @@ -179,7 +179,7 @@ def run(*args, **kwargs): logStdout = log .get('stdout', None) logStderr = log .get('stderr', None) logCmd = log .get('cmd', None) - args = _prepareArgs(args) + args = prepareArgs(args) if not bool(submit): submit = None @@ -345,7 +345,7 @@ def runfsl(*args, **kwargs): if not prefixes: raise FSLNotPresent('$FSLDIR is not set - FSL cannot be found!') - args = _prepareArgs(args) + args = prepareArgs(args) for prefix in prefixes: cmdpath = op.join(prefix, args[0]) if op.isfile(cmdpath): -- GitLab