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

Merge pull request #8729 from asottile/revert-traceback-frame 

Revert "Merge pull request #8227 from encukou/defensive-get_source"
This commit is contained in:
Anthony Sottile 2021-06-03 12:46:53 -07:00 committed by GitHub
parent 9ad726a9a0 77235e2759
commit bb9683deea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/_pytest/_code/code.py
View File

@ -725,11 +725,11 @@ class FormattedExcinfo:
) -> List[str]: ) -> List[str]:
"""Return formatted and marked up source lines.""" """Return formatted and marked up source lines."""
lines = [] lines = []
if source is not None and line_index < 0: if source is None or line_index >= len(source.lines):
line_index += len(source.lines)
if source is None or line_index >= len(source.lines) or line_index < 0:
source = Source("???") source = Source("???")
line_index = 0 line_index = 0
if line_index < 0:
line_index += len(source)
space_prefix = " " space_prefix = " "
if short: if short:
lines.append(space_prefix + source.lines[line_index].strip()) lines.append(space_prefix + source.lines[line_index].strip())