1
0
forked from VimPlug/jedi

Remove the wrapper from the class.

This commit is contained in:
Dave Halter
2016-11-28 09:49:37 +01:00
parent f6070496ad
commit 481a917ada
3 changed files with 14 additions and 19 deletions

View File

@@ -213,7 +213,7 @@ class Evaluator(object):
new_name_dicts = list(original_name_dicts) new_name_dicts = list(original_name_dicts)
for i, name_dict in enumerate(new_name_dicts): for i, name_dict in enumerate(new_name_dicts):
new_name_dicts[i] = name_dict.copy() new_name_dicts[i] = name_dict.copy()
new_name_dicts[i][str(if_name)] = [definition] new_name_dicts[i][str(if_name)] = set([definition])
name_dicts += new_name_dicts name_dicts += new_name_dicts
else: else:

View File

@@ -56,6 +56,16 @@ class Context(object):
def create_context(self, node): def create_context(self, node):
return self.evaluator.create_context(self, node) return self.evaluator.create_context(self, node)
def is_class(self):
return False
def py__bool__(self):
"""
Since Wrapper is a super class for classes, functions and modules,
the return value will always be true.
"""
return True
class TreeContext(Context): class TreeContext(Context):
def __init__(self, evaluator, parent_context=None): def __init__(self, evaluator, parent_context=None):

View File

@@ -74,22 +74,7 @@ class Executed(context.TreeContext):
return True return True
class Wrapper(tree.Base): class ClassContext(use_metaclass(CachedMetaClass, context.TreeContext)):
def is_scope(self):
return True
def is_class(self):
return False
def py__bool__(self):
"""
Since Wrapper is a super class for classes, functions and modules,
the return value will always be true.
"""
return True
class ClassContext(use_metaclass(CachedMetaClass, context.TreeContext, Wrapper)):
""" """
This class is not only important to extend `tree.Class`, it is also a This class is not only important to extend `tree.Class`, it is also a
important for descriptors (if the descriptor methods are evaluated or not). important for descriptors (if the descriptor methods are evaluated or not).
@@ -207,7 +192,7 @@ class ClassContext(use_metaclass(CachedMetaClass, context.TreeContext, Wrapper))
return ContextName(self, self.classdef.name) return ContextName(self, self.classdef.name)
class FunctionContext(use_metaclass(CachedMetaClass, context.TreeContext, Wrapper)): class FunctionContext(use_metaclass(CachedMetaClass, context.TreeContext)):
""" """
Needed because of decorators. Decorators are evaluated here. Needed because of decorators. Decorators are evaluated here.
""" """
@@ -457,7 +442,7 @@ class ModuleAttributeName(AbstractNameDefinition):
) )
class ModuleContext(use_metaclass(CachedMetaClass, context.TreeContext, Wrapper)): class ModuleContext(use_metaclass(CachedMetaClass, context.TreeContext)):
api_type = 'module' api_type = 'module'
parent_context = None parent_context = None