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

remove unused assertion parameter in source and minor cleanups

This commit is contained in:
Ronny Pfannschmidt 2018-03-09 15:03:57 +01:00
parent 3284d575e8
commit 2fe56b97c9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
_pytest/_code/source.py
View File

@ -98,14 +98,14 @@ class Source(object):
newsource.lines = [(indent + line) for line in self.lines] newsource.lines = [(indent + line) for line in self.lines]
return newsource return newsource
def getstatement(self, lineno, assertion=False): def getstatement(self, lineno):
""" return Source statement which contains the """ return Source statement which contains the
given linenumber (counted from 0). given linenumber (counted from 0).
""" """
start, end = self.getstatementrange(lineno, assertion) start, end = self.getstatementrange(lineno)
return self[start:end] return self[start:end]
def getstatementrange(self, lineno, assertion=False): def getstatementrange(self, lineno):
""" return (start, end) tuple which spans the minimal """ return (start, end) tuple which spans the minimal
statement region which containing the given lineno. statement region which containing the given lineno.
""" """
@ -310,9 +310,9 @@ def get_statement_startend2(lineno, node):
# AST's line numbers start indexing at 1 # AST's line numbers start indexing at 1
values = [] values = []
for x in ast.walk(node): for x in ast.walk(node):
if isinstance(x, ast.stmt) or isinstance(x, ast.ExceptHandler): if isinstance(x, (ast.stmt, ast.ExceptHandler)):
values.append(x.lineno - 1) values.append(x.lineno - 1)
for name in "finalbody", "orelse": for name in ("finalbody", "orelse"):
val = getattr(x, name, None) val = getattr(x, name, None)
if val: if val:
# treat the finally/orelse part as its own statement # treat the finally/orelse part as its own statement