https://github.com/python/cpython/commit/970b0433f498fd0d048b1f50229a7f0fb4d9e07a
commit: 970b0433f498fd0d048b1f50229a7f0fb4d9e07a
branch: main
author: Shrey Naithani <[email protected]>
committer: gaogaotiantian <[email protected]>
date: 2026-05-05T21:22:58-07:00
summary:
gh-148615: Handle `--` separator in pdb argument parsing (#148624)
files:
A Misc/NEWS.d/next/Library/2026-04-15-16-08-12.gh-issue-148615.Uvx50R.rst
M Lib/pdb.py
M Lib/test/test_pdb.py
diff --git a/Lib/pdb.py b/Lib/pdb.py
index f2a653cf53c748..01451f0229cacb 100644
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -3809,6 +3809,10 @@ def parse_args():
opt_module = parser.parse_args(args[:2])
opts.module = opt_module.module
args = args[2:]
+ elif args[0] == '--':
+ args.pop(0)
+ if not args:
+ parser.error("missing script or module to run")
elif args[0].startswith('-'):
# Invalid argument before the script name.
invalid_args = list(itertools.takewhile(lambda a: a.startswith('-'),
args))
diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index 8b6ccfbf051e6e..410f1436ed4d20 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -4718,6 +4718,27 @@ def bar():
]))
self.assertIn('break in bar', stdout)
+ def test_end_of_options_separator(self):
+ # gh-148615: Test parsing when '--' separator is used
+ script = "import sys; print(f'ARGS: {sys.argv[1:]}')"
+ with open(os_helper.TESTFN, 'w', encoding='utf-8') as f:
+ f.write(script)
+ stdout, _ = self._run_pdb(['--', os_helper.TESTFN, '-foo'], 'c\nq')
+ self.assertIn("ARGS: ['-foo']", stdout)
+ stdout, _ = self._run_pdb(['-c', 'continue', '--', os_helper.TESTFN,
'-c', 'foo'], 'q')
+ self.assertIn("ARGS: ['-c', 'foo']", stdout)
+ stdout, stderr = self._run_pdb(['--'], 'q', expected_returncode=2)
+ self.assertIn("missing script or module to run", stderr)
+ stdout, stderr = self._run_pdb(['-x', '--', os_helper.TESTFN], 'q',
expected_returncode=2)
+ self.assertIn("unrecognized arguments: -x", stderr)
+ stdout, _ = self._run_pdb([os_helper.TESTFN, '--', 'arg'], 'c\nq')
+ self.assertIn("ARGS: ['--', 'arg']", stdout)
+ with os_helper.temp_cwd():
+ with open('mymod.py', 'w', encoding='utf-8') as f:
+ f.write(script)
+ stdout, _ = self._run_pdb(['-m', 'mymod', '--', 'arg'], 'c\nq')
+ self.assertIn("ARGS: ['--', 'arg']", stdout)
+
@unittest.skipIf(SKIP_CORO_TESTS, "Coroutine tests are skipped")
def test_async_break(self):
script = """
diff --git
a/Misc/NEWS.d/next/Library/2026-04-15-16-08-12.gh-issue-148615.Uvx50R.rst
b/Misc/NEWS.d/next/Library/2026-04-15-16-08-12.gh-issue-148615.Uvx50R.rst
new file mode 100644
index 00000000000000..f023f0141889a6
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2026-04-15-16-08-12.gh-issue-148615.Uvx50R.rst
@@ -0,0 +1 @@
+Fix :mod:`pdb` to accept standard -- end of options separator. Reported by
haampie. Patched by Shrey Naithani.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3//lists/python-checkins.python.org
Member address: [email protected]
