floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clear instead of deleting temporary assertion variables

This commit is contained in:
Benjamin Peterson 2011-08-30 00:24:57 -04:00
parent 661a8a4a92
commit 8b211983ff
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
_pytest/assertion/rewrite.py
View File

@ -374,7 +374,7 @@ class AssertionRewriter(ast.NodeVisitor):
"""Get a new variable.""" """Get a new variable."""
# Use a character invalid in python identifiers to avoid clashing. # Use a character invalid in python identifiers to avoid clashing.
name = "@py_assert" + str(next(self.variable_counter)) name = "@py_assert" + str(next(self.variable_counter))
self.variables[self.cond_chain].add(name) self.variables.append(name)
return name return name
def assign(self, expr): def assign(self, expr):
@ -437,7 +437,7 @@ class AssertionRewriter(ast.NodeVisitor):
return [assert_] return [assert_]
self.statements = [] self.statements = []
self.cond_chain = () self.cond_chain = ()
self.variables = collections.defaultdict(set) self.variables = []
self.variable_counter = itertools.count() self.variable_counter = itertools.count()
self.stack = [] self.stack = []
self.on_failure = [] self.on_failure = []
@ -459,22 +459,11 @@ class AssertionRewriter(ast.NodeVisitor):
else: else:
raise_ = ast.Raise(exc, None, None) raise_ = ast.Raise(exc, None, None)
body.append(raise_) body.append(raise_)
# Delete temporary variables. This requires a bit cleverness about the # Clear temporary variables by setting them to None.
# order, so we don't delete variables that are themselves conditions for if self.variables:
# later variables. variables = [ast.Name(name, ast.Store()) for name in self.variables]
for chain in sorted(self.variables, key=len, reverse=True): clear = ast.Assign(variables, ast.Name("None", ast.Load()))
if chain: self.statements.append(clear)
where = []
if len(chain) > 1:
cond = ast.BoolOp(ast.And(), list(chain))
else:
cond = chain[0]
self.statements.append(ast.If(cond, where, []))
else:
where = self.statements
v = self.variables[chain]
names = [ast.Name(name, ast.Del()) for name in v]
where.append(ast.Delete(names))
# Fix line numbers. # Fix line numbers.
for stmt in self.statements: for stmt in self.statements:
set_location(stmt, assert_.lineno, assert_.col_offset) set_location(stmt, assert_.lineno, assert_.col_offset)