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

Fix some next() stuff.

Browse Source
This commit is contained in:
Dave Halter
2016-12-03 03:45:27 +01:00
parent 7607db801f
commit 2edbe44d64
4 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jedi/evaluate/instance.py
View File

@@ -213,14 +213,18 @@ class CompiledInstanceName(compiled.CompiledName):
self._instance = instance
def infer(self):
for v in super(CompiledInstanceName, self).infer():
if isinstance(v, er.FunctionContext):
for result_context in super(CompiledInstanceName, self).infer():
if isinstance(result_context, er.FunctionContext):
parent_context = result_context.parent_context
while parent_context.is_class():
parent_context = parent_context.parent_context
yield BoundMethod(
v.evaluator, self._instance, self.parent_context,
v.parent_context, v.funcdef
result_context.evaluator, self._instance, self.parent_context,
parent_context, result_context.funcdef
)
else:
yield v
yield result_context
class CompiledInstanceClassFilter(compiled.CompiledObjectFilter):
@@ -282,7 +286,7 @@ class LazyInstanceClassName(LazyInstanceName):
# functions. Only other functions and modules will resolve
# those things.
parent_context = result_context.parent_context
while isinstance(parent_context, er.ClassContext):
while parent_context.is_class():
parent_context = parent_context.parent_context
yield BoundMethod(