Skip to content

Commit

Permalink
bpo-26053: Fix args echoed by pdb run command (python#22033)
Browse files Browse the repository at this point in the history
  • Loading branch information
iritkatriel authored Apr 1, 2021
1 parent fcb55c0 commit 652bfde
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Lib/pdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -1708,7 +1708,7 @@ def main():
print("The program finished and will be restarted")
except Restart:
print("Restarting", mainpyfile, "with arguments:")
print("\t" + " ".join(args))
print("\t" + " ".join(sys.argv[1:]))
except SystemExit:
# In most cases SystemExit does not warrant a post-mortem session.
print("The program exited via sys.exit(). Exit status:", end=' ')
Expand Down
13 changes: 13 additions & 0 deletions Lib/test/test_pdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -1443,6 +1443,19 @@ def test_issue16180(self):
'Fail to handle a syntax error in the debuggee.'
.format(expected, stdout))

def test_issue26053(self):
# run command of pdb prompt echoes the correct args
script = "print('hello')"
commands = """
continue
run a b c
run d e f
quit
"""
stdout, stderr = self.run_pdb_script(script, commands)
output = '\n'.join([x.strip() for x in stdout.splitlines()])
self.assertIn("Restarting main.py with arguments:\na b c", output)
self.assertIn("Restarting main.py with arguments:\nd e f", output)

def test_readrc_kwarg(self):
script = textwrap.dedent("""
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed bug where the :mod:`pdb` interactive run command echoed the args from the shell command line, even if those have been overridden at the pdb prompt.

0 comments on commit 652bfde

Please sign in to comment.