From fa18599bde1b8c419e31c1f56bfc971e7c995e6e Mon Sep 17 00:00:00 2001 From: Savannah Ostrowski Date: Tue, 4 Aug 2026 21:43:08 -0700 Subject: [PATCH] GH-155009: Preserve argparse prog for programmatic module-as-main execution (GH-155199) (cherry picked from commit ca4518b7f73bcd79d49ea20390f45827ddd0cb67) Co-authored-by: Savannah Ostrowski --- Lib/argparse.py | 3 +++ Lib/test/test_argparse.py | 13 +++++++++++++ .../2026-08-05-02-36-18.gh-issue-155009.YiJAiP.rst | 3 +++ 3 files changed, 19 insertions(+) create mode 100644 Misc/NEWS.d/next/Library/2026-08-05-02-36-18.gh-issue-155009.YiJAiP.rst diff --git a/Lib/argparse.py b/Lib/argparse.py index c5e3ffe74c06291..bae204ac5a4d24f 100644 --- a/Lib/argparse.py +++ b/Lib/argparse.py @@ -1968,6 +1968,9 @@ def _prog_name(prog=None): if modspec is None: # simple script return _os.path.basename(arg0) + if modspec.name != '__main__' and arg0 != modspec.origin: + # named module executed as main without altering sys.argv[0] + return _os.path.basename(arg0) py = _os.path.basename(_sys.executable) if modspec.name != '__main__': # imported module or package diff --git a/Lib/test/test_argparse.py b/Lib/test/test_argparse.py index dc3c6cfe12db15d..ba0350c9f5a91ce 100644 --- a/Lib/test/test_argparse.py +++ b/Lib/test/test_argparse.py @@ -7341,6 +7341,19 @@ def test_module(self, compiled=False): def test_module_compiled(self): self.test_module(compiled=True) + def test_module_as_main_without_altering_argv(self): + basename = 'module' + os_helper.FS_NONASCII + modulename = f'{self.dirname}.{basename}' + self.make_script(self.dirname, basename) + runner_source = textwrap.dedent(f'''\ + import runpy + runpy._run_module_as_main({modulename!r}, alter_argv=False) + ''') + runner = script_helper.make_script( + self.dirname, 'runner', runner_source) + self.check_usage(os.path.basename(runner), runner, + PYTHONPATH=os.curdir) + def test_package(self, compiled=False): basename = 'subpackage' + os_helper.FS_NONASCII packagename = f'{self.dirname}.{basename}' diff --git a/Misc/NEWS.d/next/Library/2026-08-05-02-36-18.gh-issue-155009.YiJAiP.rst b/Misc/NEWS.d/next/Library/2026-08-05-02-36-18.gh-issue-155009.YiJAiP.rst new file mode 100644 index 000000000000000..219c6a94b91cb62 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2026-08-05-02-36-18.gh-issue-155009.YiJAiP.rst @@ -0,0 +1,3 @@ +Fix :class:`argparse.ArgumentParser` to preserve the program name from +``sys.argv[0]`` when a named module is executed as the main program without +replacing ``sys.argv[0]``.