[3.10] bpo-44461: Check early that a pdb target is valid for execution. (GH-27227) (GH-27399)

Automerge-Triggered-By: GH:jaraco
This commit is contained in:
Jason R. Coombs 2021-07-28 09:04:38 -04:00 committed by GitHub
parent 5502ee052f
commit 684eb5cb80
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 0 deletions

View file

@ -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:

View file

@ -1695,6 +1695,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'
os_helper.rmtree(pkg_name)
modpath = pkg_name + '/' + module_name
os.makedirs(modpath)
with open(modpath + '/__init__.py', 'w') as f:
pass
self.addCleanup(os_helper.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

View file

@ -0,0 +1 @@
Fix bug with :mod:`pdb`'s handling of import error due to a package which does not have a ``__main__`` module