From 412dba34bc6c8dd5bc96d5219c515bede76af02e Mon Sep 17 00:00:00 2001
From: Martin Craig <martin.craig@eng.ox.ac.uk>
Date: Fri, 13 Jul 2018 10:47:31 +0100
Subject: [PATCH] OOPS: Accidentally committed incomplete merge
---
fsl/wrappers/wrapperutils.py | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/fsl/wrappers/wrapperutils.py b/fsl/wrappers/wrapperutils.py
index eb7bd529e..f1b6dca52 100644
--- a/fsl/wrappers/wrapperutils.py
+++ b/fsl/wrappers/wrapperutils.py
@@ -624,21 +624,6 @@ class _FileOrThing(object):
setattr(wrapped, '_fot_prefixes', prefixes)
# Call the function
-<<<<<<< HEAD
- result = func(*args, **kwargs)
-
- # make a _Reults object to store
- # the output. If we are decorating
- # another _FileOrThing, the
- # results will get merged together
- # into a single _Results dict.
- if not isinstance(result, _FileOrThing._Results):
- result = _FileOrThing._Results(result)
-
- # Load the LOADed outputs
- for oname, ofile in outfiles.items():
- if op.exists(ofile): result[oname] = self.__load(ofile)
-=======
try:
result = func(*args, **kwargs)
@@ -650,7 +635,6 @@ class _FileOrThing(object):
delattr(wrapped, '_fot_workdir')
delattr(wrapped, '_fot_outprefix')
delattr(wrapped, '_fot_prefixes')
->>>>>>> enh/wrappers
return self.__generateResult(
td, result, outprefix, outfiles, prefixes)
@@ -766,12 +750,7 @@ class _FileOrThing(object):
isprefixed = (prefix is not None and
name.startswith(prefix))
-<<<<<<< HEAD
- if val is None:
- allargs.pop(name, None)
-=======
if not (isprefixed or name in things):
->>>>>>> enh/wrappers
continue
# Prefixed output files may only
--
GitLab