diff options
Diffstat (limited to 'coverage')
| -rw-r--r-- | coverage/env.py | 4 | ||||
| -rw-r--r-- | coverage/parser.py | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/coverage/env.py b/coverage/env.py index 7b845f66..f2881e32 100644 --- a/coverage/env.py +++ b/coverage/env.py @@ -92,6 +92,10 @@ class PYBEHAVIOR(object): # PyPy has always omitted statements after return. omit_after_return = omit_after_jump or PYPY + # Modules used to have firstlineno equal to the line number of the first + # real line of code. Now they always start at 1. + module_firstline_1 = pep626 + # Coverage.py specifics. # Are we using the C-implemented trace function? diff --git a/coverage/parser.py b/coverage/parser.py index 007f7599..6a3ca2fc 100644 --- a/coverage/parser.py +++ b/coverage/parser.py @@ -205,6 +205,12 @@ class PythonParser(object): if not empty: self.raw_statements.update(self.byte_parser._find_statements()) + # The first line of modules can lie and say 1 always, even if the first + # line of code is later. If so, map 1 to the actual first line of the + # module. + if env.PYBEHAVIOR.module_firstline_1 and self._multiline: + self._multiline[1] = min(self.raw_statements) + def first_line(self, line): """Return the first line number of the statement including `line`.""" if line < 0: @@ -620,7 +626,9 @@ class AstArcAnalyzer(object): return node.lineno def _line__Module(self, node): - if node.body: + if env.PYBEHAVIOR.module_firstline_1: + return 1 + elif node.body: return self.line_for_node(node.body[0]) else: # Empty modules have no line number, they always start at 1. |