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

always operate on class in super and not on an instance. that's the proper way.

Browse Source
This commit is contained in:
Dave Halter
2014-07-30 11:34:27 +02:00
parent e81749bbe1
commit 196afaacbf
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jedi/evaluate/representation.py
View File

@@ -176,7 +176,7 @@ class Instance(use_metaclass(CachedMetaClass, Executable)):
def __getattr__(self, name): def __getattr__(self, name):
if name not in ['start_pos', 'end_pos', 'name', 'get_imports', if name not in ['start_pos', 'end_pos', 'name', 'get_imports',
'doc', 'raw_doc', 'asserts', 'py_bases']: 'doc', 'raw_doc', 'asserts']:
raise AttributeError("Instance %s: Don't touch this (%s)!" raise AttributeError("Instance %s: Don't touch this (%s)!"
% (self, name)) % (self, name))
return getattr(self.base, name) return getattr(self.base, name)

2
jedi/evaluate/stdlib.py
View File

@@ -100,6 +100,8 @@ def builtins_super(evaluator, obj, params):
if isinstance(cls, wanted): if isinstance(cls, wanted):
if isinstance(cls, pr.Class): if isinstance(cls, pr.Class):
cls = er.Class(evaluator, cls) cls = er.Class(evaluator, cls)
elif isinstance(cls, er.Instance):
cls = cls.base
su = cls.py_bases() su = cls.py_bases()
if su: if su:
return evaluator.execute(su[0]) return evaluator.execute(su[0])