mirror of
https://github.com/python/cpython.git
synced 2025-11-03 11:23:31 +00:00
gh-103225: Fixed zero lineno issue for pdb (#103265)
Co-authored-by: Artem Mukhin <ortem00@gmail.com>
This commit is contained in:
parent
800382a2b0
commit
2667452945
3 changed files with 38 additions and 2 deletions
14
Lib/pdb.py
14
Lib/pdb.py
|
|
@ -1351,7 +1351,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
|
||||||
filename = self.curframe.f_code.co_filename
|
filename = self.curframe.f_code.co_filename
|
||||||
breaklist = self.get_file_breaks(filename)
|
breaklist = self.get_file_breaks(filename)
|
||||||
try:
|
try:
|
||||||
lines, lineno = inspect.getsourcelines(self.curframe)
|
lines, lineno = self._getsourcelines(self.curframe)
|
||||||
except OSError as err:
|
except OSError as err:
|
||||||
self.error(err)
|
self.error(err)
|
||||||
return
|
return
|
||||||
|
|
@ -1367,7 +1367,7 @@ class Pdb(bdb.Bdb, cmd.Cmd):
|
||||||
except:
|
except:
|
||||||
return
|
return
|
||||||
try:
|
try:
|
||||||
lines, lineno = inspect.getsourcelines(obj)
|
lines, lineno = self._getsourcelines(obj)
|
||||||
except (OSError, TypeError) as err:
|
except (OSError, TypeError) as err:
|
||||||
self.error(err)
|
self.error(err)
|
||||||
return
|
return
|
||||||
|
|
@ -1662,6 +1662,16 @@ class Pdb(bdb.Bdb, cmd.Cmd):
|
||||||
return _rstr(self._format_exc(exc))
|
return _rstr(self._format_exc(exc))
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
|
def _getsourcelines(self, obj):
|
||||||
|
# GH-103319
|
||||||
|
# inspect.getsourcelines() returns lineno = 0 for
|
||||||
|
# module-level frame which breaks our code print line number
|
||||||
|
# This method should be replaced by inspect.getsourcelines(obj)
|
||||||
|
# once this bug is fixed in inspect
|
||||||
|
lines, lineno = inspect.getsourcelines(obj)
|
||||||
|
lineno = max(1, lineno)
|
||||||
|
return lines, lineno
|
||||||
|
|
||||||
# Collect all command help into docstring, if not run with -OO
|
# Collect all command help into docstring, if not run with -OO
|
||||||
|
|
||||||
if __doc__ is not None:
|
if __doc__ is not None:
|
||||||
|
|
|
||||||
|
|
@ -1675,6 +1675,31 @@ def test_pdb_issue_gh_101673():
|
||||||
(Pdb) continue
|
(Pdb) continue
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
def test_pdb_issue_gh_103225():
|
||||||
|
"""See GH-103225
|
||||||
|
|
||||||
|
Make sure longlist uses 1-based line numbers in frames that correspond to a module
|
||||||
|
|
||||||
|
>>> with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE
|
||||||
|
... 'longlist',
|
||||||
|
... 'continue'
|
||||||
|
... ]):
|
||||||
|
... a = 1
|
||||||
|
... import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
|
||||||
|
... b = 2
|
||||||
|
> <doctest test.test_pdb.test_pdb_issue_gh_103225[0]>(7)<module>()
|
||||||
|
-> b = 2
|
||||||
|
(Pdb) longlist
|
||||||
|
1 with PdbTestInput([ # doctest: +NORMALIZE_WHITESPACE
|
||||||
|
2 'longlist',
|
||||||
|
3 'continue'
|
||||||
|
4 ]):
|
||||||
|
5 a = 1
|
||||||
|
6 import pdb; pdb.Pdb(nosigint=True, readrc=False).set_trace()
|
||||||
|
7 -> b = 2
|
||||||
|
(Pdb) continue
|
||||||
|
"""
|
||||||
|
|
||||||
|
|
||||||
@support.requires_subprocess()
|
@support.requires_subprocess()
|
||||||
class PdbTestCase(unittest.TestCase):
|
class PdbTestCase(unittest.TestCase):
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
Fix a bug in :mod:`pdb` when displaying line numbers of module-level source code.
|
||||||
Loading…
Add table
Add a link
Reference in a new issue