Skip to content

Commit 2667452

Browse files
gh-103225: Fixed zero lineno issue for pdb (#103265)
Co-authored-by: Artem Mukhin <[email protected]>
1 parent 800382a commit 2667452

File tree

3 files changed

+38
-2
lines changed

3 files changed

+38
-2
lines changed

Lib/pdb.py

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,7 +1351,7 @@ def do_longlist(self, arg):
13511351
filename = self.curframe.f_code.co_filename
13521352
breaklist = self.get_file_breaks(filename)
13531353
try:
1354-
lines, lineno = inspect.getsourcelines(self.curframe)
1354+
lines, lineno = self._getsourcelines(self.curframe)
13551355
except OSError as err:
13561356
self.error(err)
13571357
return
@@ -1367,7 +1367,7 @@ def do_source(self, arg):
13671367
except:
13681368
return
13691369
try:
1370-
lines, lineno = inspect.getsourcelines(obj)
1370+
lines, lineno = self._getsourcelines(obj)
13711371
except (OSError, TypeError) as err:
13721372
self.error(err)
13731373
return
@@ -1662,6 +1662,16 @@ def _compile_error_message(self, expr):
16621662
return _rstr(self._format_exc(exc))
16631663
return ""
16641664

1665+
def _getsourcelines(self, obj):
1666+
# GH-103319
1667+
# inspect.getsourcelines() returns lineno = 0 for
1668+
# module-level frame which breaks our code print line number
1669+
# This method should be replaced by inspect.getsourcelines(obj)
1670+
# once this bug is fixed in inspect
1671+
lines, lineno = inspect.getsourcelines(obj)
1672+
lineno = max(1, lineno)
1673+
return lines, lineno
1674+
16651675
# Collect all command help into docstring, if not run with -OO
16661676

16671677
if __doc__ is not None:

Lib/test/test_pdb.py

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1675,6 +1675,31 @@ def test_pdb_issue_gh_101673():
16751675
(Pdb) continue
16761676
"""
16771677

1678+
def test_pdb_issue_gh_103225():
1679+
"""See GH-103225
1680+
1681+
Make sure longlist uses 1-based line numbers in frames that correspond to a module
1682+
1683+
>>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE
1684+
... 'longlist',
1685+
... 'continue'
1686+
... ]):
1687+
... a = 1
1688+
... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
1689+
... b = 2
1690+
> <doctest test.test_pdb.test_pdb_issue_gh_103225[0]>(7)<module>()
1691+
-> b = 2
1692+
(Pdb) longlist
1693+
1 with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE
1694+
2 'longlist',
1695+
3 'continue'
1696+
4 ]):
1697+
5 a = 1
1698+
6 import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
1699+
7 -> b = 2
1700+
(Pdb) continue
1701+
"""
1702+
16781703

16791704
@support.requires_subprocess()
16801705
class PdbTestCase(unittest.TestCase):
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix a bug in :mod:`pdb` when displaying line numbers of module-level source code.

0 commit comments

Comments
 (0)