From 99739aa640b3066aa2d40c91f00d35f0e61d74e8 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Tue, 3 Nov 2015 17:35:45 +0100 Subject: [PATCH] per_index_values is now a method that all the iterable objects should support. however its name is confusing and it should soon be refactored. --- jedi/evaluate/iterable.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jedi/evaluate/iterable.py b/jedi/evaluate/iterable.py index 172c2254..0046f4ce 100644 --- a/jedi/evaluate/iterable.py +++ b/jedi/evaluate/iterable.py @@ -395,18 +395,18 @@ class MergedArray(_FakeArray): def ordered_elements_of_iterable(evaluator, iterable_type, all_values): """ - This function returns the ordered types of an iterable. If the input is not - an Array, we just return all types as the first and only item of the - output list. + This function returns the ordered types of an iterable. """ ordered = [] # Unpack the iterator values for sequence in iterable_type: - if not isinstance(sequence, Array): + try: + per_index_values = sequence.per_index_values + except AttributeError: ordered = [literals_to_types(evaluator, all_values)] break else: - for i, types in enumerate(sequence.per_index_values()): + for i, types in enumerate(per_index_values()): try: ordered[i] |= types except IndexError: