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

er.Array is now also iterable

Browse Source
This commit is contained in:
David Halter
2013-02-10 21:15:04 +01:00
parent df17c98061
commit 01c48593bf
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
jedi/evaluate_representation.py
View File

@@ -630,7 +630,7 @@ class Execution(Executable):
arrays = evaluate.follow_call_list(stmt.get_commands()[1:]) arrays = evaluate.follow_call_list(stmt.get_commands()[1:])
# *args must be some sort of an array, otherwise -> ignore # *args must be some sort of an array, otherwise -> ignore
for array in arrays: for array in arrays:
for field_stmt in array: for field_stmt in array: # yield from plz!
yield None, field_stmt yield None, field_stmt
# **kwargs # **kwargs
elif stmt.get_commands()[0] == '**': elif stmt.get_commands()[0] == '**':
@@ -863,11 +863,19 @@ class Array(use_metaclass(cache.CachedMetaClass, pr.Base)):
def __getattr__(self, name): def __getattr__(self, name):
if name not in ['type', 'start_pos', 'get_only_subelement', 'parent', if name not in ['type', 'start_pos', 'get_only_subelement', 'parent',
'get_parent_until', 'items', 'get_parent_until', 'items']:
'__iter__', '__len__', '__getitem__']:
raise AttributeError('Strange access on %s: %s.' % (self, name)) raise AttributeError('Strange access on %s: %s.' % (self, name))
return getattr(self._array, name) return getattr(self._array, name)
def __getitem__(self):
return self._array.__getitem__()
def __iter__(self):
return self._array.__iter__()
def __len__(self):
return self._array.__len__()
def __repr__(self): def __repr__(self):
return "<e%s of %s>" % (type(self).__name__, self._array) return "<e%s of %s>" % (type(self).__name__, self._array)

2
jedi/parsing_representation.py
View File

@@ -767,7 +767,7 @@ class Statement(Simple):
and not tok in ['>=', '<=', '==', '!='] and not tok in ['>=', '<=', '==', '!=']
def parse_array(token_iterator, array_type, start_pos, add_el=None): def parse_array(token_iterator, array_type, start_pos, add_el=None):
arr = Array(self.module, start_pos, array_type) arr = Array(self.module, start_pos, array_type, self)
if add_el is not None: if add_el is not None:
arr.add_statement(add_el) arr.add_statement(add_el)