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

Revert "Merge pull request #8227 from encukou/defensive-get_source"
pytest-dev · Jun 3, 2021 · bb9683d · bb9683d
2 parents 9ad726a + 77235e2
commit bb9683d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py
@@ -725,11 +725,11 @@ def get_source(
     ) -> List[str]:
         """Return formatted and marked up source lines."""
         lines = []
-        if source is not None and line_index < 0:
-            line_index += len(source.lines)
-        if source is None or line_index >= len(source.lines) or line_index < 0:
+        if source is None or line_index >= len(source.lines):
             source = Source("???")
             line_index = 0
+        if line_index < 0:
+            line_index += len(source)
         space_prefix = "    "
         if short:
             lines.append(space_prefix + source.lines[line_index].strip())