[Python-checkins] [3.9] bpo-44461: Check early that a pdb target is valid for execution. (GH-27227) (GH-27400)
jaraco
webhook-mailer at python.org
Wed Jul 28 18:48:58 EDT 2021
https://github.com/python/cpython/commit/49b5e20fa8c091f9158ccd26f9a12fc1e91cfc93
commit: 49b5e20fa8c091f9158ccd26f9a12fc1e91cfc93
branch: 3.9
author: Jason R. Coombs <jaraco at jaraco.com>
committer: jaraco <jaraco at jaraco.com>
date: 2021-07-28T18:48:52-04:00
summary:
[3.9] bpo-44461: Check early that a pdb target is valid for execution. (GH-27227) (GH-27400)
* [3.9] bpo-44461: Check early that a pdb target is valid for execution. (GH-27227)
* bpo-44461: Fix bug with pdb's handling of import error due to a package which does not have a __main__ module
* 📜🤖 Added by blurb_it.
* remove "else"
Co-authored-by: Jason R. Coombs <jaraco at jaraco.com>
* If running as a module, first check that it can run as a module. Alternate fix for bpo-44461.
Co-authored-by: Irit Katriel
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Co-authored-by: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>.
(cherry picked from commit ee03bad25e83b00ba5fc2a0265b48c6286e6b3f7)
Co-authored-by: Jason R. Coombs <jaraco at jaraco.com>
* Ensure os_helper is imported.
* Actually, os_helper doesn't exist yet. Just reference rmtree from support.
files:
A Misc/NEWS.d/next/Library/2021-06-29-21-17-17.bpo-44461.acqRnV.rst
M Lib/pdb.py
M Lib/test/test_pdb.py
diff --git a/Lib/pdb.py b/Lib/pdb.py
index 1b4ff54833fcb..943211158ac41 100755
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -1694,6 +1694,14 @@ def main():
print('Error:', mainpyfile, 'does not exist')
sys.exit(1)
+ if run_as_module:
+ import runpy
+ try:
+ runpy._get_module_details(mainpyfile)
+ except Exception:
+ traceback.print_exc()
+ sys.exit(1)
+
sys.argv[:] = args # Hide "pdb.py" and pdb options from argument list
if not run_as_module:
diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index 193207a9aba50..0653a64b0a697 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -1632,6 +1632,20 @@ def test_module_without_a_main(self):
self.assertIn("ImportError: No module named t_main.__main__",
stdout.splitlines())
+ def test_package_without_a_main(self):
+ pkg_name = 't_pkg'
+ module_name = 't_main'
+ support.rmtree(pkg_name)
+ modpath = pkg_name + '/' + module_name
+ os.makedirs(modpath)
+ with open(modpath + '/__init__.py', 'w') as f:
+ pass
+ self.addCleanup(support.rmtree, pkg_name)
+ stdout, stderr = self._run_pdb(['-m', modpath.replace('/', '.')], "")
+ self.assertIn(
+ "'t_pkg.t_main' is a package and cannot be directly executed",
+ stdout)
+
def test_blocks_at_first_code_line(self):
script = """
#This is a comment, on line 2
diff --git a/Misc/NEWS.d/next/Library/2021-06-29-21-17-17.bpo-44461.acqRnV.rst b/Misc/NEWS.d/next/Library/2021-06-29-21-17-17.bpo-44461.acqRnV.rst
new file mode 100644
index 0000000000000..02e25e928b9cf
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2021-06-29-21-17-17.bpo-44461.acqRnV.rst
@@ -0,0 +1 @@
+Fix bug with :mod:`pdb`'s handling of import error due to a package which does not have a ``__main__`` module
\ No newline at end of file
More information about the Python-checkins
mailing list