From 931a85ee09a6de2687b8252972fb156826b8a8b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filipe=20La=C3=ADns?= <lains@riseup.net>
Date: Thu, 8 Jul 2021 17:28:01 +0100
Subject: [PATCH] [3.10] bpo-44446: support lineno being None in
 traceback.FrameSummary (GH-26781)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As of 088a15c49d99ecb4c3bef93f8f40dd513c6cae3b, lineno is None instead
of -1 if there is no line number.

Signed-off-by: Filipe Laíns <lains@riseup.net>.
(cherry picked from commit 91a8f8c16ca9a7e2466a8241d9b41769ef97d094)

Co-authored-by: Filipe Laíns <lains@riseup.net>
---
 Lib/test/test_traceback.py                                 | 4 ++++
 Lib/traceback.py                                           | 7 ++++---
 .../next/Library/2021-06-17-22-39-34.bpo-44446.qwdRic.rst  | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2021-06-17-22-39-34.bpo-44446.qwdRic.rst

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index dd9459040ebc3a..61d86a1166e713 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -1001,6 +1001,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
index 7a7cca1b677029..463cb221fa2c8a 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -301,9 +301,10 @@ def __len__(self):
     @property
     def line(self):
         if self._line is None:
-            self._line = linecache.getline(self.filename, self.lineno).strip()
-        return self._line
-
+            if self.lineno is None:
+                return None
+            self._line = linecache.getline(self.filename, self.lineno)
+        return self._line.strip()
 
 def walk_stack(f):
     """Walk a stack yielding the frame and line number for each frame.
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
new file mode 100644
index 00000000000000..6d9758f42dd04f
--- /dev/null
+++ 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`.