Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Lib/test/test_traceback.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 4 additions & 3 deletions Lib/traceback.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Take into account that ``lineno`` might be ``None`` in :class:`traceback.FrameSummary`.