From 2fce48228840814aaa3372a26dd0ba235c3b2d24 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Thu, 26 Mar 2020 14:42:03 +0000
Subject: [PATCH] RF: Allow passing log=None
---
fsl/data/image.py | 2 +-
fsl/utils/run.py | 14 +++++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/fsl/data/image.py b/fsl/data/image.py
index 97fe2d722..d54c75b04 100644
--- a/fsl/data/image.py
+++ b/fsl/data/image.py
@@ -1002,7 +1002,7 @@ class Image(Nifti):
:arg image: A string containing the name of an image file to load,
or a :mod:`numpy` array, or a :mod:`nibabel` image
- object.
+ object, or an ``Image``object.
:arg name: A name for the image.
diff --git a/fsl/utils/run.py b/fsl/utils/run.py
index 70915cf2d..caacbf976 100644
--- a/fsl/utils/run.py
+++ b/fsl/utils/run.py
@@ -180,13 +180,17 @@ def run(*args, **kwargs):
returnStderr = kwargs.pop('stderr', False)
returnExitcode = kwargs.pop('exitcode', False)
submit = kwargs.pop('submit', {})
- log = kwargs.pop('log', {})
- tee = log .get('tee', False)
- logStdout = log .get('stdout', None)
- logStderr = log .get('stderr', None)
- logCmd = log .get('cmd', None)
+ log = kwargs.pop('log', None)
args = prepareArgs(args)
+ if log is None:
+ log = {}
+
+ tee = log.get('tee', False)
+ logStdout = log.get('stdout', None)
+ logStderr = log.get('stderr', None)
+ logCmd = log.get('cmd', None)
+
if not bool(submit):
submit = None
--
GitLab