diff --git a/jedi/evaluate/finder.py b/jedi/evaluate/finder.py index dce94830..d534c662 100644 --- a/jedi/evaluate/finder.py +++ b/jedi/evaluate/finder.py @@ -414,7 +414,7 @@ def _apply_decorators(evaluator, context, node): # Create a trailer and evaluate it. trailer = tree.Node('trailer', trailer) trailer.parent = dec - dec_values = context.eval_trailer(dec_values, trailer) + dec_values = evaluator.eval_trailer(context, dec_values, trailer) if not len(dec_values): debug.warning('decorator not found: %s on %s', dec, node) diff --git a/jedi/evaluate/instance.py b/jedi/evaluate/instance.py index e49988bc..3c1bde7f 100644 --- a/jedi/evaluate/instance.py +++ b/jedi/evaluate/instance.py @@ -222,7 +222,7 @@ class BoundMethod(Context): def py__call__(self, var_args): function_execution = InstanceFunctionExecution( self._instance, - self._class_context.parent_context, + self.parent_context, self._function.funcdef, var_args )