VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2026-01-31 04:15:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: In the py__iter__ version, we didn't respect __next__ being an option.

Browse Source
This commit is contained in:
Dave Halter
2015-12-01 19:55:13 +01:00
parent 37c21726e7
commit 53dbdf22a2
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
jedi/evaluate/representation.py
View File

@@ -34,7 +34,7 @@ import imp
import re
from itertools import chain
from jedi._compatibility import use_metaclass, unicode, Python3Method
from jedi._compatibility import use_metaclass, unicode, Python3Method, is_py3
from jedi.parser import tree
from jedi import debug
from jedi import common
@@ -218,9 +218,18 @@ class Instance(use_metaclass(CachedMetaClass, Executed)):
debug.warning('No __iter__ on %s.' % self)
return
else:
for generator in self._evaluator.execute(method):
for typ in generator.py__iter__():
yield typ
iters = self._evaluator.execute(method)
for generator in iters:
if isinstance(generator, Instance):
# `__next__` logic.
name = '__next__' if is_py3 else 'next'
try:
yield generator.execute_subscope_by_name(name)
except KeyError:
debug.warning('Instance has no __next__ function in %s.', generator)
else:
for typ in generator.py__iter__():
yield typ
@property
@underscore_memoization