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

Move the unite function to common.

Browse Source
This commit is contained in:
Dave Halter
2015-06-18 14:16:16 +02:00
parent 0543586abd
commit a67408ad03
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jedi/common.py
View File

@@ -3,6 +3,7 @@ import sys
import contextlib import contextlib
import functools import functools
import re import re
from itertools import chain
from ast import literal_eval from ast import literal_eval
from jedi._compatibility import unicode, reraise from jedi._compatibility import unicode, reraise
@@ -152,3 +153,8 @@ def splitlines(string):
Also different: Returns ``['']`` for an empty string input. Also different: Returns ``['']`` for an empty string input.
""" """
return re.split('\n|\r\n', string) return re.split('\n|\r\n', string)
def unite(iterable):
"""Turns a two dimensional array into a one dimensional."""
return list(chain.from_iterable(iterable))

20
jedi/evaluate/iterable.py
View File

@@ -20,9 +20,7 @@ It is important to note that:
1. Array modfications work only in the current module. 1. Array modfications work only in the current module.
2. Jedi only checks Array additions; ``list.pop``, etc are ignored. 2. Jedi only checks Array additions; ``list.pop``, etc are ignored.
""" """
from itertools import chain from jedi.common import unite, ignored, safe_property
from jedi import common
from jedi import debug from jedi import debug
from jedi import settings from jedi import settings
from jedi._compatibility import use_metaclass, is_py3, unicode from jedi._compatibility import use_metaclass, is_py3, unicode
@@ -33,11 +31,6 @@ from jedi.evaluate.cache import CachedMetaClass, memoize_default
from jedi.evaluate import analysis from jedi.evaluate import analysis
def unite(iterable):
"""Turns a two dimensional array into a one dimensional."""
return list(chain.from_iterable(iterable))
class IterableWrapper(tree.Base): class IterableWrapper(tree.Base):
def is_class(self): def is_class(self):
return False return False
@@ -225,7 +218,7 @@ class Array(IterableWrapper, ArrayMixin):
lookup_done = True lookup_done = True
elif isinstance(index, compiled.CompiledObject) \ elif isinstance(index, compiled.CompiledObject) \
and isinstance(index.obj, (int, str, unicode)): and isinstance(index.obj, (int, str, unicode)):
with common.ignored(KeyError, IndexError, TypeError): with ignored(KeyError, IndexError, TypeError):
types += self.get_exact_index_types(index.obj) types += self.get_exact_index_types(index.obj)
lookup_done = True lookup_done = True
@@ -257,7 +250,7 @@ class Array(IterableWrapper, ArrayMixin):
def iter_content(self): def iter_content(self):
return self.values() return self.values()
@common.safe_property @safe_property
def parent(self): def parent(self):
return compiled.builtin return compiled.builtin
@@ -273,7 +266,7 @@ class Array(IterableWrapper, ArrayMixin):
def _values(self): def _values(self):
"""Returns a list of a list of node.""" """Returns a list of a list of node."""
if self.type == 'dict': if self.type == 'dict':
return list(chain.from_iterable(v for k, v in self._items())) return unite(v for k, v in self._items())
else: else:
return self._items() return self._items()
@@ -354,8 +347,7 @@ class FakeDict(_FakeArray):
self._dct = dct self._dct = dct
def get_exact_index_types(self, index): def get_exact_index_types(self, index):
return list(chain.from_iterable(self._evaluator.eval_element(v) return unite(self._evaluator.eval_element(v) for v in self._dct[index])
for v in self._dct[index]))
def _items(self): def _items(self):
return self._dct.items() return self._dct.items()
@@ -370,7 +362,7 @@ class MergedArray(_FakeArray):
raise IndexError raise IndexError
def values(self): def values(self):
return list(chain(*(a.values() for a in self._arrays))) return unite(*(a.values() for a in self._arrays))
def __iter__(self): def __iter__(self):
for array in self._arrays: for array in self._arrays: