diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/runpy.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_cmd_line_script.py | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/Lib/runpy.py b/Lib/runpy.py index c98af19..af6205d 100644 --- a/Lib/runpy.py +++ b/Lib/runpy.py @@ -132,6 +132,8 @@ def _get_module_details(mod_name, error=ImportError): pkg_main_name = mod_name + ".__main__" return _get_module_details(pkg_main_name, error) except error as e: + if mod_name not in sys.modules: + raise # No module loaded; being a package is irrelevant raise error(("%s; %r is a package and cannot " + "be directly executed") %(e, mod_name)) loader = spec.loader diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py index 96711d6..afac62a 100644 --- a/Lib/test/test_cmd_line_script.py +++ b/Lib/test/test_cmd_line_script.py @@ -442,6 +442,19 @@ class CmdLineTest(unittest.TestCase): self.assertRegex(err, regex) self.assertNotIn(b'Traceback', err) + def test_dash_m_bad_pyc(self): + with support.temp_dir() as script_dir, \ + support.change_cwd(path=script_dir): + os.mkdir('test_pkg') + # Create invalid *.pyc as empty file + with open('test_pkg/__init__.pyc', 'wb'): + pass + err = self.check_dash_m_failure('test_pkg') + self.assertRegex(err, br'Error while finding spec.*' + br'ImportError.*bad magic number') + self.assertNotIn(b'is a package', err) + self.assertNotIn(b'Traceback', err) + def test_dash_m_init_traceback(self): # These were wrapped in an ImportError and tracebacks were # suppressed; see Issue 14285 |