diff options
| -rw-r--r-- | Lib/test/test_cmd_line.py | 18 | ||||
| -rw-r--r-- | Modules/main.c | 1 | ||||
| -rw-r--r-- | Python/getopt.c | 2 |
3 files changed, 17 insertions, 4 deletions
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py index aa99c15..4e56cd1 100644 --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -387,12 +387,24 @@ class CmdLineTest(unittest.TestCase): print("del sys.modules['__main__']", file=script) assert_python_ok(filename) - def test_unknown_options(self): - rc, out, err = assert_python_failure('-z', __cleanenv=True) - self.assertIn(b'Unknown option', err) + rc, out, err = assert_python_failure('-E', '-z') + self.assertIn(b'Unknown option: -z', err) + self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1) + self.assertEqual(b'', out) + # Add "without='-E'" to prevent _assert_python to append -E + # to env_vars and change the output of stderr + rc, out, err = assert_python_failure('-z', without='-E') + self.assertIn(b'Unknown option: -z', err) self.assertEqual(err.splitlines().count(b'Unknown option: -z'), 1) self.assertEqual(b'', out) + rc, out, err = assert_python_failure('-a', '-z', without='-E') + self.assertIn(b'Unknown option: -a', err) + # only the first unknown option is reported + self.assertNotIn(b'Unknown option: -z', err) + self.assertEqual(err.splitlines().count(b'Unknown option: -a'), 1) + self.assertEqual(b'', out) + def test_main(): test.support.run_unittest(CmdLineTest) diff --git a/Modules/main.c b/Modules/main.c index d63c49a..79ad6f5 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -334,6 +334,7 @@ Py_Main(int argc, wchar_t **argv) /* Hash randomization needed early for all string operations (including -W and -X options). */ + _PyOS_opterr = 0; /* prevent printing the error in 1st pass */ while ((c = _PyOS_GetOpt(argc, argv, PROGRAM_OPTS)) != EOF) { if (c == 'm' || c == 'c') { /* -c / -m is the last option: following arguments are diff --git a/Python/getopt.c b/Python/getopt.c index 037aa5d..5cf4cbd 100644 --- a/Python/getopt.c +++ b/Python/getopt.c @@ -45,7 +45,7 @@ static wchar_t *opt_ptr = L""; void _PyOS_ResetGetOpt(void) { - _PyOS_opterr = 0; /* prevent printing the error in 2nd loop in main.c */ + _PyOS_opterr = 1; _PyOS_optind = 1; _PyOS_optarg = NULL; opt_ptr = L""; |