VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Fix an issue with magic methods on classes. Fixes #461.

Browse Source
This commit is contained in:
Dave Halter
2016-07-31 23:42:00 +02:00
parent 647a4db326
commit 6440e33512
3 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jedi/evaluate/representation.py
View File

@@ -579,7 +579,7 @@ class Function(use_metaclass(CachedMetaClass, Wrapper)):
if search_global:
yield self.names_dict
else:
scope = compiled.get_special_object(self._evaluator, 'FUNCTION_CLASS')
scope = self.py__class__()
for names_dict in scope.names_dicts(False):
yield names_dict
@@ -605,7 +605,13 @@ class Function(use_metaclass(CachedMetaClass, Wrapper)):
return dct
def py__class__(self):
return compiled.get_special_object(self._evaluator, 'FUNCTION_CLASS')
# This differentiation is only necessary for Python2. Python3 does not
# use a different method class.
if isinstance(self.base.get_parent_scope(), tree.Class):
name = 'METHOD_CLASS'
else:
name = 'FUNCTION_CLASS'
return compiled.get_special_object(self._evaluator, name)
def __getattr__(self, name):
return getattr(self.base_func, name)