1
0
forked from VimPlug/jedi

Dict key that are not in dict should return all value types.

This commit is contained in:
Dave Halter
2014-10-27 00:19:31 +01:00
parent e4124fcf9a
commit 8df8749f22
3 changed files with 26 additions and 14 deletions

View File

@@ -119,7 +119,7 @@ class GeneratorComprehension(Generator):
return self._evaluator.eval_statement_element(self.comprehension)
class Array(use_metaclass(CachedMetaClass, IterableWrapper)):
class Array(IterableWrapper):
"""
Used as a mirror to pr.Array, if needed. It defines some getter
methods which are important in this module.
@@ -208,7 +208,7 @@ class Array(use_metaclass(CachedMetaClass, IterableWrapper)):
def _values(self):
if self.type == pr.Array.DICT:
return [v for k, v in self._items()]
return list(chain.from_iterable(v for k, v in self._items()))
else:
return self._items()
@@ -223,7 +223,7 @@ class Array(use_metaclass(CachedMetaClass, IterableWrapper)):
if op is None or op == ',':
kv.append(key) # A set.
elif op == ':': # A dict.
kv.append((key, next(iterator)))
kv.append((key, [next(iterator)]))
next(iterator, None) # Possible comma.
else:
raise NotImplementedError('dict/set comprehensions')
@@ -251,6 +251,19 @@ class FakeSequence(Array):
for v in self._sequence_values[index]))
class FakeDict(Array):
def __init__(self, evaluator, dct):
super(FakeDict, self).__init__(evaluator, None, pr.Array.DICT)
self._dct = dct
def get_exact_index_types(self, index):
return list(chain.from_iterable(self._evaluator.eval_element(v)
for v in self._dct[index]))
def _items(self):
return self._dct.items()
class MergedArray(Array):
def __init__(self, evaluator, arrays):
super(MergedArray, self).__init__(evaluator, arrays[-1]._array)