Change implementation of StatementElement.

Instead of having both next and execution as attributes, we now only have next, because it's an execution if there's an array.
This commit is contained in:
Dave Halter
2014-08-18 22:25:55 +02:00
parent 7619bf27d1
commit 8006d6f190
7 changed files with 36 additions and 52 deletions
+3 -3
View File
@@ -187,7 +187,7 @@ class NameFinder(object):
# Compare start_pos, because names may be different
# because of executions.
if c.name.start_pos == name.start_pos \
and c.execution:
and isinstance(c.next, pr.Array):
return True
return False
@@ -391,10 +391,10 @@ def _check_isinstance_type(evaluator, stmt, search_name_part):
assert len(expression_list) == 1
call = expression_list[0]
assert isinstance(call, pr.Call) and str(call.name) == 'isinstance'
assert bool(call.execution)
assert call.next_is_execution()
# isinstance check
isinst = call.execution.values
isinst = call.next.values
assert len(isinst) == 2 # has two params
obj, classes = [statement.expression_list() for statement in isinst]
assert len(obj) == 1