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

in the process...

Browse Source
This commit is contained in:
Dave Halter
2014-01-11 02:55:50 +01:00
parent e7c7bbca79
commit 28ab937eca
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jedi/evaluate/representation.py
View File

@@ -122,6 +122,7 @@ class Instance(use_metaclass(CachedMetaClass, Executable)):
def get_subscope_by_name(self, name):
sub = self.base.get_subscope_by_name(name)
print sub
return InstanceElement(self._evaluator, self, sub, True)
def execute_subscope_by_name(self, name, args=()):
@@ -199,11 +200,13 @@ class InstanceElement(use_metaclass(CachedMetaClass, pr.Base)):
def parent(self):
par = self.var.parent
if isinstance(par, Class) and par == self.instance.base \
or isinstance(par, pr.Class) \
or isinstance(par, pr.Class) \
and par == self.instance.base.base:
par = self.instance
elif not isinstance(par, pr.Module):
elif not isinstance(par, (pr.Module, compiled.PyObject)):
print 'HA', par, self.var
par = InstanceElement(self.instance._evaluator, self.instance, par, self.is_class_var)
print 'H2A', par
return par
def get_parent_until(self, *args, **kwargs):