##// END OF EJS Templates
don't use common names in require decorators...
MinRK -
Show More
@@ -40,8 +40,8 b' class depend(object):'
40 raises an UnmetDependency error, then the task will not be run
40 raises an UnmetDependency error, then the task will not be run
41 and another engine will be tried.
41 and another engine will be tried.
42 """
42 """
43 def __init__(self, f, *args, **kwargs):
43 def __init__(self, _wrapped_f, *args, **kwargs):
44 self.f = f
44 self.f = _wrapped_f
45 self.args = args
45 self.args = args
46 self.kwargs = kwargs
46 self.kwargs = kwargs
47
47
@@ -54,14 +54,14 b' class dependent(object):'
54 in traditional decorators, which are not picklable.
54 in traditional decorators, which are not picklable.
55 """
55 """
56
56
57 def __init__(self, f, df, *dargs, **dkwargs):
57 def __init__(self, _wrapped_f, _wrapped_df, *dargs, **dkwargs):
58 self.f = f
58 self.f = _wrapped_f
59 name = getattr(f, '__name__', 'f')
59 name = getattr(f, '__name__', 'f')
60 if py3compat.PY3:
60 if py3compat.PY3:
61 self.__name__ = name
61 self.__name__ = name
62 else:
62 else:
63 self.func_name = name
63 self.func_name = name
64 self.df = df
64 self.df = _wrapped_df
65 self.dargs = dargs
65 self.dargs = dargs
66 self.dkwargs = dkwargs
66 self.dkwargs = dkwargs
67
67
General Comments 0
You need to be logged in to leave comments. Login now