bpo-44446: support lineno being None in traceback.FrameSummary (GH-26781)

FFY00 · web-flow · commit 91a8f8c16ca9 · 2021-07-08T17:28:01.000+01:00
As of 088a15c, lineno is None instead of -1 if there is no line number. Signed-off-by: Filipe Laíns <lains@riseup.net>
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
@@ -1204,6 +1204,10 @@ def test_lazy_lines(self):
             '"""Test cases for traceback module"""',
             f.line)
 
+    def test_no_line(self):
+        f = traceback.FrameSummary("f", None, "dummy")
+        self.assertEqual(f.line, None)
+
     def test_explicit_line(self):
         f = traceback.FrameSummary("f", 1, "dummy", line="line")
         self.assertEqual("line", f.line)
diff --git a/Lib/traceback.py b/Lib/traceback.py
@@ -310,6 +310,8 @@ def _original_line(self):
     @property
     def line(self):
         if self._line is None:
+            if self.lineno is None:
+                return None
             self._line = linecache.getline(self.filename, self.lineno)
         return self._line.strip()
 
diff --git a/Misc/NEWS.d/next/Library/2021-06-17-22-39-34.bpo-44446.qwdRic.rst b/Misc/NEWS.d/next/Library/2021-06-17-22-39-34.bpo-44446.qwdRic.rst
@@ -0,0 +1 @@
+Take into account that ``lineno`` might be ``None`` in :class:`traceback.FrameSummary`.

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Take into account that ``lineno`` might be ``None`` in :class:`traceback.FrameSummary`.