diff -r 6619b76053a5 Lib/test/libregrtest/cmdline.py --- a/Lib/test/libregrtest/cmdline.py Thu Sep 29 22:31:28 2016 +0200 +++ b/Lib/test/libregrtest/cmdline.py Tue Oct 11 16:34:26 2016 +0200 @@ -242,9 +242,6 @@ def _create_parser(): group.add_argument('-P', '--pgo', dest='pgo', action='store_true', help='enable Profile Guided Optimization training') - parser.add_argument('args', nargs='*', - help=argparse.SUPPRESS) - return parser @@ -294,7 +291,13 @@ def _parse_args(args, **kwargs): ns.use_resources = [] parser = _create_parser() - parser.parse_args(args=args, namespace=ns) + # Issue #14191: argparse doesn't support "intermixed" positional and + # optional arguments. Use parse_known_args() as workaround. + ns.args = parser.parse_known_args(args=args, namespace=ns)[1] + for arg in ns.args: + if arg.startswith('-'): + parser.error("unrecognized arguments: %s" % arg) + sys.exit(1) if ns.single and ns.fromfile: parser.error("-s and -f don't go together!") diff -r 6619b76053a5 Lib/test/test_regrtest.py --- a/Lib/test/test_regrtest.py Thu Sep 29 22:31:28 2016 +0200 +++ b/Lib/test/test_regrtest.py Tue Oct 11 16:34:26 2016 +0200 @@ -299,6 +299,15 @@ class ParseArgsTestCase(unittest.TestCas self.assertEqual(ns.verbose, 0) self.assertEqual(ns.args, ['foo']) + def test_arg_option_arg(self): + ns = libregrtest._parse_args(['test_unaryop', '-v', 'test_binop']) + self.assertEqual(ns.verbose, 1) + self.assertEqual(ns.args, ['test_unaryop', 'test_binop']) + + def test_unknown_option(self): + self.checkError(['--unknown-option'], + 'unrecognized arguments: --unknown-option') + class BaseTestCase(unittest.TestCase): TEST_UNIQUE_ID = 1