1
0
forked from VimPlug/jedi

Get rid of Array.values() and Array.__iter__().

This commit is contained in:
Dave Halter
2015-12-10 15:56:45 +01:00
parent 3a975db0d7
commit b10a048167
5 changed files with 18 additions and 22 deletions

View File

@@ -225,12 +225,6 @@ class Array(IterableWrapper, ArrayMixin):
def name(self):
return helpers.FakeName(self.type, parent=self)
@memoize_default()
def values(self):
result = unite(self._evaluator.eval_element(v) for v in self._values())
result |= check_array_additions(self._evaluator, self)
return result
@memoize_default()
def dict_values(self):
return unite(self._evaluator.eval_element(v) for v in self._values())
@@ -321,9 +315,6 @@ class Array(IterableWrapper, ArrayMixin):
else:
return [array_node]
def __iter__(self):
return iter(self._items())
def __repr__(self):
return "<%s of %s>" % (type(self).__name__, self.atom)
@@ -396,15 +387,12 @@ class MergedArray(_FakeArray):
for types in array.py__iter__():
yield types
def values(self):
return unite((a.values() for a in self._arrays))
def py__getitem__(self, index):
return unite(self.py__iter__())
def __iter__(self):
def _items(self):
for array in self._arrays:
for a in array:
for a in array._items():
yield a
def __len__(self):