Skip to content

[3.13] gh-95468: Add more tests for "--" (double dash) in test_argparse (GH-124274) #125068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions Lib/test/test_argparse.py
Original file line number Diff line number Diff line change
Expand Up @@ -5783,7 +5783,9 @@ def test_zero_or_more_optional(self):
args = parser.parse_args([])
self.assertEqual(NS(x=[]), args)

def test_double_dash(self):

class TestDoubleDash(TestCase):
def test_single_argument_option(self):
parser = argparse.ArgumentParser(exit_on_error=False)
parser.add_argument('-f', '--foo')
parser.add_argument('bar', nargs='*')
Expand All @@ -5807,6 +5809,7 @@ def test_double_dash(self):
args = parser.parse_args(['a', '--', 'b', '--', 'c', '--foo', 'd'])
self.assertEqual(NS(foo=None, bar=['a', 'b', '--', 'c', '--foo', 'd']), args)

def test_multiple_argument_option(self):
parser = argparse.ArgumentParser(exit_on_error=False)
parser.add_argument('-f', '--foo', nargs='*')
parser.add_argument('bar', nargs='*')
Expand All @@ -5829,6 +5832,7 @@ def test_double_dash(self):
self.assertEqual(NS(foo=['c'], bar=['a', 'b']), args)
self.assertEqual(argv, ['--', 'd'])

def test_multiple_double_dashes(self):
parser = argparse.ArgumentParser(exit_on_error=False)
parser.add_argument('foo')
parser.add_argument('bar', nargs='*')
Expand All @@ -5844,9 +5848,10 @@ def test_double_dash(self):
args = parser.parse_args(['--', '--', 'a', '--', 'b', 'c'])
self.assertEqual(NS(foo='--', bar=['a', '--', 'b', 'c']), args)

def test_remainder(self):
parser = argparse.ArgumentParser(exit_on_error=False)
parser.add_argument('foo')
parser.add_argument('bar', nargs=argparse.REMAINDER)
parser.add_argument('bar', nargs='...')

args = parser.parse_args(['--', 'a', 'b', 'c'])
self.assertEqual(NS(foo='a', bar=['b', 'c']), args)
Expand All @@ -5857,6 +5862,40 @@ def test_double_dash(self):
args = parser.parse_args(['a', '--', 'b', '--', 'c'])
self.assertEqual(NS(foo='a', bar=['b', '--', 'c']), args)

parser = argparse.ArgumentParser(exit_on_error=False)
parser.add_argument('--foo')
parser.add_argument('bar', nargs='...')
args = parser.parse_args(['--foo', 'a', '--', 'b', '--', 'c'])
self.assertEqual(NS(foo='a', bar=['--', 'b', '--', 'c']), args)

def test_subparser(self):
parser = argparse.ArgumentParser(exit_on_error=False)
parser.add_argument('foo')
subparsers = parser.add_subparsers()
parser1 = subparsers.add_parser('run')
parser1.add_argument('-f')
parser1.add_argument('bar', nargs='*')

args = parser.parse_args(['x', 'run', 'a', 'b', '-f', 'c'])
self.assertEqual(NS(foo='x', f='c', bar=['a', 'b']), args)
args = parser.parse_args(['x', 'run', 'a', 'b', '--', '-f', 'c'])
self.assertEqual(NS(foo='x', f=None, bar=['a', 'b', '-f', 'c']), args)
args = parser.parse_args(['x', 'run', 'a', '--', 'b', '-f', 'c'])
self.assertEqual(NS(foo='x', f=None, bar=['a', 'b', '-f', 'c']), args)
args = parser.parse_args(['x', 'run', '--', 'a', 'b', '-f', 'c'])
self.assertEqual(NS(foo='x', f=None, bar=['a', 'b', '-f', 'c']), args)
args = parser.parse_args(['x', '--', 'run', 'a', 'b', '-f', 'c'])
self.assertEqual(NS(foo='x', f='c', bar=['a', 'b']), args)
args = parser.parse_args(['--', 'x', 'run', 'a', 'b', '-f', 'c'])
self.assertEqual(NS(foo='x', f='c', bar=['a', 'b']), args)
args = parser.parse_args(['x', 'run', '--', 'a', '--', 'b'])
self.assertEqual(NS(foo='x', f=None, bar=['a', '--', 'b']), args)
args = parser.parse_args(['x', '--', 'run', '--', 'a', '--', 'b'])
self.assertEqual(NS(foo='x', f=None, bar=['a', '--', 'b']), args)
self.assertRaisesRegex(argparse.ArgumentError,
"invalid choice: '--'",
parser.parse_args, ['--', 'x', '--', 'run', 'a', 'b'])


# ===========================
# parse_intermixed_args tests
Expand Down
Loading