diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py index 83aa1633566..d8bc2637af5 100644 --- a/Lib/test/test_cmd_line_script.py +++ b/Lib/test/test_cmd_line_script.py @@ -287,6 +287,21 @@ def test_issue8202_dash_m_file_ignored(self): self._check_output(script_name, rc, out, script_name, script_name, '', '') + def test_dash_m_error_code_is_one(self): + # If a module is invoked with the -m command line flag + # and results in an error that the return code to the + # shell is '1' + with temp_dir() as script_dir: + with support.temp_cwd(path=script_dir): + pkg_dir = os.path.join(script_dir, 'test_pkg') + make_pkg(pkg_dir) + script_name = _make_test_script(pkg_dir, 'other', + "if __name__ == '__main__': raise ValueError") + rc, out, err = assert_python_failure('-m', 'test_pkg.other', *example_args) + if verbose > 1: + print(out) + self.assertEqual(rc, 1) + def test_pep_409_verbiage(self): # Make sure PEP 409 syntax properly suppresses # the context of an exception diff --git a/Misc/NEWS b/Misc/NEWS index cba8c416e28..ab02a97d30f 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ What's New in Python 3.3.0 Beta 2? Core and Builtins ----------------- +- Issue #15033: Fix the exit status bug when modules invoked using -m swith, + return the proper failure return value (1). Patch contributed by Jeff Knupp. + - Issue #15229: An OSError subclass whose __init__ doesn't call back OSError.__init__ could produce incomplete instances, leading to crashes when calling str() on them. diff --git a/Modules/main.c b/Modules/main.c index e262552ea61..64bac6e9aaa 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -660,7 +660,7 @@ Py_Main(int argc, wchar_t **argv) sts = run_command(command, &cf); free(command); } else if (module) { - sts = RunModule(module, 1); + sts = (RunModule(module, 1) != 0); } else {