diff --git a/holoviews/core/accessors.py b/holoviews/core/accessors.py index 8c3ec1e649..ec3ab3fc5e 100644 --- a/holoviews/core/accessors.py +++ b/holoviews/core/accessors.py @@ -23,31 +23,31 @@ def __new__(mcs, classname, bases, classdict): @classmethod def pipelined(mcs, __call__): - def pipelined_call(*a, **k): + def pipelined_call(*args, **kwargs): from .data import Dataset, MultiDimensionalMapping - inst = a[0] + inst = args[0] if not hasattr(inst._obj, '_pipeline'): # Wrapped object doesn't support the pipeline property - return __call__(*a, **k) + return __call__(*args, **kwargs) in_method = inst._obj._in_method if not in_method: inst._obj._in_method = True - result = __call__(*a, **k) + result = __call__(*args, **kwargs) if not in_method: mode = getattr(inst, 'mode', None) if isinstance(result, Dataset): result._pipeline = inst._obj._pipeline + [ (type(inst), [], {'mode': mode}), - (__call__, list(a[1:]), k) + (__call__, list(args[1:]), kwargs) ] elif isinstance(result, MultiDimensionalMapping): for key, element in result.items(): element._pipeline = inst._obj._pipeline + [ (type(inst), [], {'mode': mode}), - (__call__, list(a[1:]), k), + (__call__, list(args[1:]), kwargs), (getattr(type(result), '__getitem__'), [key], {}) ] inst._obj._in_method = False diff --git a/holoviews/core/data/__init__.py b/holoviews/core/data/__init__.py index 61f15c3faa..06abfa6306 100644 --- a/holoviews/core/data/__init__.py +++ b/holoviews/core/data/__init__.py @@ -191,23 +191,23 @@ def __new__(mcs, classname, bases, classdict): @staticmethod def pipelined(method): - def pipelined_fn(*a, **k): - inst = a[0] + def pipelined_fn(*args, **kwargs): + inst = args[0] in_method = inst._in_method if not in_method: inst._in_method = True - result = method(*a, **k) + result = method(*args, **kwargs) if not in_method: if isinstance(result, Dataset): result._pipeline = inst._pipeline + [ - (method, list(a[1:]), k) + (method, list(args[1:]), kwargs) ] elif isinstance(result, MultiDimensionalMapping): for key, element in result.items(): element._pipeline = inst._pipeline + [ - (method, list(a[1:]), k), + (method, list(args[1:]), kwargs), (getattr(type(result), '__getitem__'), [key], {}) ] inst._in_method = False