Skip to content
Snippets Groups Projects
Commit daf308f5 authored by Paul McCarthy's avatar Paul McCarthy :mountain_bicyclist:
Browse files

BF: Fix py2 syntax error.

parent da6d3389
No related branches found
No related tags found
No related merge requests found
...@@ -511,8 +511,8 @@ class _FileOrThing(object): ...@@ -511,8 +511,8 @@ class _FileOrThing(object):
prepOut, prepOut,
load, load,
removeExt, removeExt,
*things, *args,
outprefix=None): **kwargs):
"""Initialise a ``_FileOrThing`` decorator. """Initialise a ``_FileOrThing`` decorator.
:arg func: The function to be decorated. :arg func: The function to be decorated.
...@@ -530,15 +530,17 @@ class _FileOrThing(object): ...@@ -530,15 +530,17 @@ class _FileOrThing(object):
:arg removeExt: Function which can remove a file extension from a file :arg removeExt: Function which can remove a file extension from a file
path. path.
:arg things: Names of all arguments which will be handled by :arg outprefix: Must be passed as a keyword argument. The name of a
this ``_FileOrThing`` decorator. If not provided, positional or keyword argument to the function, which
*all* arguments passed to the function will be specifies an output file name prefix. All other
handled. arguments with names that begin with this prefix may
be interpreted as things to ``LOAD``.
All other positional arguments are interpreted as the names of the
arguments to the function which will be handled by this
``_FileOrThing`` decorator. If not provided, *all* arguments passed to
the function will be handled.
:arg outprefix: The name of a positional or keyword argument to the
function, which specifies an output file name prefix.
All other arguments with names that begin with this
prefix may be interpreted as things to ``LOAD``.
The ``prepIn`` and ``prepOut`` functions must accept the following The ``prepIn`` and ``prepOut`` functions must accept the following
positional arguments: positional arguments:
...@@ -555,8 +557,8 @@ class _FileOrThing(object): ...@@ -555,8 +557,8 @@ class _FileOrThing(object):
self.__prepOut = prepOut self.__prepOut = prepOut
self.__load = load self.__load = load
self.__removeExt = removeExt self.__removeExt = removeExt
self.__things = things self.__things = args
self.__outprefix = outprefix self.__outprefix = kwargs.get('outprefix', None)
def __call__(self, *args, **kwargs): def __call__(self, *args, **kwargs):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment