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

Get rid of ordered_elements_of_iterable and use py__iter__ instead.

Browse Source
This commit is contained in:
Dave Halter
2015-12-02 13:36:39 +01:00
parent 9a2256f557
commit d835ffc5a3
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/evaluate/__init__.py
View File

@@ -164,8 +164,8 @@ class Evaluator(object):
# Iterate through result and add the values, that's possible # Iterate through result and add the values, that's possible
# only in for loops without clutter, because they are # only in for loops without clutter, because they are
# predictable. Also only do it, if the variable is not a tuple. # predictable. Also only do it, if the variable is not a tuple.
for_iterable = self.eval_element(for_stmt.get_input_node()) for_iterables = self.eval_element(for_stmt.get_input_node())
ordered = iterable.ordered_elements_of_iterable(self, for_iterable, types) ordered = list(iterable.py__iter__(self, for_iterables))
for index_types in ordered: for index_types in ordered:
dct = {str(for_stmt.children[1]): index_types} dct = {str(for_stmt.children[1]): index_types}

4
jedi/evaluate/iterable.py
View File

@@ -152,7 +152,7 @@ class Comprehension(IterableWrapper):
def py__iter__(self): def py__iter__(self):
def nested(input_types, comp_fors): def nested(input_types, comp_fors):
iterated = ordered_elements_of_iterable(evaluator, input_types, []) iterated = py__iter__(evaluator, input_types)
comp_for = comp_fors[0] comp_for = comp_fors[0]
exprlist = comp_for.children[1] exprlist = comp_for.children[1]
for types in iterated: for types in iterated:
@@ -469,7 +469,7 @@ def unpack_tuple_to_dict(evaluator, types, exprlist):
'testlist_star_expr'): 'testlist_star_expr'):
dct = {} dct = {}
parts = iter(exprlist.children[::2]) parts = iter(exprlist.children[::2])
for iter_types in ordered_elements_of_iterable(evaluator, types, []): for iter_types in py__iter__(evaluator, types):
try: try:
part = next(parts) part = next(parts)
except StopIteration: except StopIteration:

2
jedi/evaluate/representation.py
View File

@@ -689,7 +689,7 @@ class FunctionExecution(Executed):
yield evaluator.eval_element(yield_.children[1]) yield evaluator.eval_element(yield_.children[1])
else: else:
for_types = evaluator.eval_element(for_stmt.get_input_node()) for_types = evaluator.eval_element(for_stmt.get_input_node())
ordered = iterable.ordered_elements_of_iterable(evaluator, for_types, set()) ordered = iterable.py__iter__(evaluator, for_types)
for index_types in ordered: for index_types in ordered:
dct = {str(for_stmt.children[1]): index_types} dct = {str(for_stmt.children[1]): index_types}
evaluator.predefined_if_name_dict_dict[for_stmt] = dct evaluator.predefined_if_name_dict_dict[for_stmt] = dct

2
jedi/evaluate/stdlib.py
View File

@@ -164,7 +164,7 @@ def builtins_reversed(evaluator, sequences, obj, arguments):
# values again. # values again.
all_sequence_types = get_iterable_content(evaluator, arguments, 0) all_sequence_types = get_iterable_content(evaluator, arguments, 0)
ordered = iterable.ordered_elements_of_iterable(evaluator, sequences, all_sequence_types) ordered = list(iterable.py__iter__(evaluator, sequences))
rev = [iterable.AlreadyEvaluated(o) for o in reversed(ordered)] rev = [iterable.AlreadyEvaluated(o) for o in reversed(ordered)]
# Repack iterator values and then run it the normal way. This is # Repack iterator values and then run it the normal way. This is