|
7 | 7 | # SPDX-License-Identifier: BSD-3-Clause |
8 | 8 |
|
9 | 9 | import shlex |
10 | | -import sys |
11 | | -from argparse import SUPPRESS, ArgumentParser, Namespace |
| 10 | +from argparse import SUPPRESS, ArgumentParser, BooleanOptionalAction, Namespace |
12 | 11 |
|
13 | 12 | import pytest |
14 | 13 |
|
15 | 14 | from reverse_argparse import ReverseArgumentParser |
16 | 15 |
|
17 | 16 |
|
18 | | -BOOLEAN_OPTIONAL_ACTION_MINOR_VERSION = 9 |
19 | | - |
20 | | - |
21 | | -if sys.version_info.minor >= BOOLEAN_OPTIONAL_ACTION_MINOR_VERSION: |
22 | | - from argparse import BooleanOptionalAction |
23 | | - |
24 | | - |
25 | 17 | @pytest.fixture |
26 | 18 | def parser() -> ArgumentParser: |
27 | 19 | """ |
@@ -51,10 +43,7 @@ def parser() -> ArgumentParser: |
51 | 43 | ) |
52 | 44 | p.add_argument("--verbose", "-v", action="count", default=2) |
53 | 45 | p.add_argument("--ext", action="extend", nargs="*") |
54 | | - if sys.version_info.minor >= BOOLEAN_OPTIONAL_ACTION_MINOR_VERSION: |
55 | | - p.add_argument( |
56 | | - "--bool-opt", action=BooleanOptionalAction, default=False |
57 | | - ) |
| 46 | + p.add_argument("--bool-opt", action=BooleanOptionalAction, default=False) |
58 | 47 | return p |
59 | 48 |
|
60 | 49 |
|
@@ -144,20 +133,12 @@ def test_get_effective_command_line_invocation(parser, args) -> None: |
144 | 133 | namespace = parser.parse_args(shlex.split(args)) |
145 | 134 | unparser = ReverseArgumentParser(parser, namespace) |
146 | 135 | expected = ( |
147 | | - ( |
148 | | - "--opt1 opt1-val --opt2 opt2-val1 opt2-val2 --store-true " |
149 | | - "--store-false --needs-quotes 'hello world' --default 42 --app1 " |
150 | | - "app1-val1 --app1 app1-val2 --app2 app2-val1 --app2 app2-val2 " |
151 | | - "--app-nargs app-nargs1-val1 app-nargs1-val2 --app-nargs " |
152 | | - "app-nargs2-val --const --app-const1 --app-const2 -vv --ext " |
153 | | - "ext-val1 ext-val2 ext-val3 " |
154 | | - ) |
155 | | - + ( |
156 | | - "--no-bool-opt " |
157 | | - if sys.version_info.minor >= BOOLEAN_OPTIONAL_ACTION_MINOR_VERSION |
158 | | - else "" |
159 | | - ) |
160 | | - + "pos1-val1 pos1-val2 pos2-val" |
| 136 | + "--opt1 opt1-val --opt2 opt2-val1 opt2-val2 --store-true " |
| 137 | + "--store-false --needs-quotes 'hello world' --default 42 --app1 " |
| 138 | + "app1-val1 --app1 app1-val2 --app2 app2-val1 --app2 app2-val2 " |
| 139 | + "--app-nargs app-nargs1-val1 app-nargs1-val2 --app-nargs " |
| 140 | + "app-nargs2-val --const --app-const1 --app-const2 -vv --ext ext-val1 " |
| 141 | + "ext-val2 ext-val3 --no-bool-opt pos1-val1 pos1-val2 pos2-val" |
161 | 142 | ) |
162 | 143 | result = strip_first_entry( |
163 | 144 | unparser.get_effective_command_line_invocation() |
@@ -186,10 +167,9 @@ def test_get_pretty_command_line_invocation(parser, args) -> None: |
186 | 167 | --app-const1 \\ |
187 | 168 | --app-const2 \\ |
188 | 169 | -vv \\ |
189 | | - --ext ext-val1 ext-val2 ext-val3 \\""" |
190 | | - if sys.version_info.minor >= BOOLEAN_OPTIONAL_ACTION_MINOR_VERSION: |
191 | | - expected += "\n --no-bool-opt \\" |
192 | | - expected += """\n pos1-val1 pos1-val2 \\ |
| 170 | + --ext ext-val1 ext-val2 ext-val3 \\ |
| 171 | + --no-bool-opt \\ |
| 172 | + pos1-val1 pos1-val2 \\ |
193 | 173 | pos2-val""" |
194 | 174 | result = strip_first_line(unparser.get_pretty_command_line_invocation()) |
195 | 175 | assert result == expected |
@@ -274,16 +254,15 @@ def test__unparse_args_boolean_optional_action() -> None: |
274 | 254 | With a ``BooleanOptionalAction``, which became available in Python |
275 | 255 | 3.9. |
276 | 256 | """ |
277 | | - if sys.version_info.minor >= BOOLEAN_OPTIONAL_ACTION_MINOR_VERSION: |
278 | | - parser = ArgumentParser() |
279 | | - parser.add_argument("--foo", action=BooleanOptionalAction) |
280 | | - try: |
281 | | - namespace = parser.parse_args(shlex.split("--foo")) |
282 | | - except SystemExit: |
283 | | - namespace = Namespace() |
284 | | - unparser = ReverseArgumentParser(parser, namespace) |
285 | | - unparser._unparse_args() |
286 | | - assert unparser._args[1:] == [" --foo"] |
| 257 | + parser = ArgumentParser() |
| 258 | + parser.add_argument("--foo", action=BooleanOptionalAction) |
| 259 | + try: |
| 260 | + namespace = parser.parse_args(shlex.split("--foo")) |
| 261 | + except SystemExit: |
| 262 | + namespace = Namespace() |
| 263 | + unparser = ReverseArgumentParser(parser, namespace) |
| 264 | + unparser._unparse_args() |
| 265 | + assert unparser._args[1:] == [" --foo"] |
287 | 266 |
|
288 | 267 |
|
289 | 268 | def test__unparse_args_already_unparsed() -> None: |
@@ -635,14 +614,11 @@ def test__unparse_extend_action() -> None: |
635 | 614 | ) |
636 | 615 | def test__unparse_boolean_optional_action(default, args, expected) -> None: |
637 | 616 | """Ensure ``BooleanOptionalAction`` actions are handled appropriately.""" |
638 | | - if sys.version_info.minor >= BOOLEAN_OPTIONAL_ACTION_MINOR_VERSION: |
639 | | - parser = ArgumentParser() |
640 | | - action = parser.add_argument( |
641 | | - "--bool-opt", action=BooleanOptionalAction, default=default |
642 | | - ) |
643 | | - namespace = parser.parse_args(shlex.split(args)) |
644 | | - unparser = ReverseArgumentParser(parser, namespace) |
645 | | - unparser._unparse_boolean_optional_action(action) |
646 | | - assert unparser._args[1:] == ( |
647 | | - [expected] if expected is not None else [] |
648 | | - ) |
| 617 | + parser = ArgumentParser() |
| 618 | + action = parser.add_argument( |
| 619 | + "--bool-opt", action=BooleanOptionalAction, default=default |
| 620 | + ) |
| 621 | + namespace = parser.parse_args(shlex.split(args)) |
| 622 | + unparser = ReverseArgumentParser(parser, namespace) |
| 623 | + unparser._unparse_boolean_optional_action(action) |
| 624 | + assert unparser._args[1:] == ([expected] if expected is not None else []) |
0 commit comments