From f34a9281b9228648b68bc4ef0dcd1b3e926a9ad2 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Fri, 3 Aug 2018 11:34:33 +0200 Subject: [PATCH] Don't have execute and execute_evaluated on name --- jedi/evaluate/context/instance.py | 4 ++-- jedi/evaluate/filters.py | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/jedi/evaluate/context/instance.py b/jedi/evaluate/context/instance.py index 41981962..b2af36ab 100644 --- a/jedi/evaluate/context/instance.py +++ b/jedi/evaluate/context/instance.py @@ -64,7 +64,7 @@ class AbstractInstanceContext(Context): raise AttributeError def execute(arguments): - return ContextSet.from_sets(name.execute(arguments) for name in names) + return ContextSet.from_sets(name.infer().execute(arguments) for name in names) return execute @@ -87,7 +87,7 @@ class AbstractInstanceContext(Context): def execute_function_slots(self, names, *evaluated_args): return ContextSet.from_sets( - name.execute_evaluated(*evaluated_args) + name.infer().execute_evaluated(*evaluated_args) for name in names ) diff --git a/jedi/evaluate/filters.py b/jedi/evaluate/filters.py index 4294f2a6..fd41b55a 100644 --- a/jedi/evaluate/filters.py +++ b/jedi/evaluate/filters.py @@ -38,12 +38,6 @@ class AbstractNameDefinition(object): return '<%s: %s>' % (self.__class__.__name__, self.string_name) return '<%s: %s@%s>' % (self.__class__.__name__, self.string_name, self.start_pos) - def execute(self, arguments): - return self.infer().execute(arguments) - - def execute_evaluated(self, *args, **kwargs): - return self.infer().execute_evaluated(*args, **kwargs) - def is_import(self): return False