From 282ab2d6d7f943d9891a060694eb4ab3094f9317 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Thu, 1 Mar 2018 18:11:21 +0000
Subject: [PATCH] chained _FileOrThing decorators construct output correctly
---
fsl/wrappers/wrapperutils.py | 39 ++++++++++++++++++++++++------------
1 file changed, 26 insertions(+), 13 deletions(-)
diff --git a/fsl/wrappers/wrapperutils.py b/fsl/wrappers/wrapperutils.py
index b60c57912..aae73d463 100644
--- a/fsl/wrappers/wrapperutils.py
+++ b/fsl/wrappers/wrapperutils.py
@@ -176,7 +176,17 @@ def required(*reqargs):
for reqarg in reqargs:
assert reqarg in kwargs
return func(**kwargs)
- return _update_wrapper(wrapper, func)
+
+ wrapper = _update_wrapper(wrapper, func)
+
+ # If this is a bound method, make
+ # sure that the instance is set on
+ # the wrapper function - this is
+ # needed by _FileOrThing decorators.
+ if hasattr(func, '__self__'):
+ wrapper.__self__ = func.__self__
+
+ return wrapper
return decorator
@@ -320,25 +330,28 @@ class _FileOrThing(object):
def __call__(self, func):
"""Creates and returns the real decorator function. """
- self.__func = func
- self.__isFileOrThing = False
+ isFOT = isinstance(getattr(func, '__self__', None), _FileOrThing)
+ wrapper = functools.partial(self.__wrapper, func, isFOT)
- if hasattr(func, '__self__'):
- self.__isFileOrThing = isinstance(func.__self__, _FileOrThing)
+ # TODO
+ wrapper = _update_wrapper(wrapper, func)
+ wrapper.__self__ = self
- wrapper = functools.partial(self.__wrapper, func)
+ return wrapper
- return _update_wrapper(wrapper, func)
-
- def __wrapper(self, func, *args, **kwargs):
+ def __wrapper(self, func, isFileOrThing, *args, **kwargs):
"""Function which wraps ``func``, ensuring that any arguments of
type ``Thing`` are saved to temporary files, and any arguments
with the value :data:`RETURN` are loaded and returned.
- """
- func = self.__func
- isFileOrThing = self.__isFileOrThing
+ :arg func: The func being wrapped.
+
+ :arg isFileOrThing: Set to ``True`` if ``func`` is a wrapper metho
+ of another ``_FileOrThing`` instance. In this case,
+ the output arguments will be flattenedinto a single
+ tuple.
+ """
kwargs = kwargs.copy()
kwargs.update(argsToKwargs(func, args))
@@ -372,7 +385,7 @@ class _FileOrThing(object):
if isFileOrThing:
things = result[1:]
result = result[0]
- return tuple([result] + things + outthings)
+ return tuple([result] + list(things) + outthings)
else:
return tuple([result] + outthings)
--
GitLab