From f755e615c96a8d3f9d40adbead263813e8beba86 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Thu, 9 Jan 2014 17:06:02 +0100 Subject: [PATCH] magic_method -> magic_function --- jedi/api/__init__.py | 2 +- jedi/evaluate/__init__.py | 2 +- jedi/evaluate/representation.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py index ce50e546..d8451662 100644 --- a/jedi/api/__init__.py +++ b/jedi/api/__init__.py @@ -192,7 +192,7 @@ class Script(object): debug.dbg('possible scopes', scopes) for s in scopes: if s.isinstance(er.Function): - names = s.get_magic_method_names() + names = s.get_magic_function_names() else: if isinstance(s, imports.ImportPath): under = like + self._user_context.get_path_after_cursor() diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py index bd0690b4..904256c3 100644 --- a/jedi/evaluate/__init__.py +++ b/jedi/evaluate/__init__.py @@ -372,7 +372,7 @@ class Evaluator(object): else: # The function must not be decorated with something else. if type.isinstance(er.Function): - type = type.get_magic_method_scope() + type = type.get_magic_function_scope() else: # This is the typical lookup while chaining things. if filter_private_variable(type, scope, current): diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py index 5a9d39e3..fa99f538 100644 --- a/jedi/evaluate/representation.py +++ b/jedi/evaluate/representation.py @@ -375,10 +375,10 @@ class Function(use_metaclass(CachedMetaClass, pr.IsScope)): return Function(self._evaluator, self.base_func, True) return decorated_func - def get_magic_method_names(self): + def get_magic_function_names(self): return compiled.magic_function_scope(self._evaluator).get_defined_names() - def get_magic_method_scope(self): + def get_magic_function_scope(self): return compiled.magic_function_scope(self._evaluator) def __getattr__(self, name):