Skip to content

Fix intermixed optional flags before/after URL on all Pythons #1946

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.

Sign up for GitHub

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

Open
BetterAndBetterII wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix intermixed optional flags before/after URL on all Pythons #1946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion httpie/cli/argparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def parse_args(
) -> argparse.Namespace:
self.env = env
self.env.args = namespace = namespace or argparse.Namespace()
self.args, no_options = super().parse_known_args(args, namespace)
self.args, no_options = super().parse_known_intermixed_args(args, namespace)
if self.args.debug:
self.args.traceback = True
self.has_stdin_data = (
Expand Down
21 changes: 21 additions & 0 deletions tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,27 @@ def test_guess_when_method_set_but_invalid_and_item_exists(self):
]


class TestIntermixedOptions:
"""Optional flags may appear before, between, or after positionals."""

@pytest.mark.parametrize('args', [
# Flag after URL (fails on Python < 3.13 with parse_known_args).
['--offline', '--ignore-stdin', 'post', 'pie.dev/post', '-v',
'header1:xyz', 'x=1'],
# Flag between METHOD and URL (fails on all Python versions).
['--offline', '--ignore-stdin', 'post', '-v', 'pie.dev/post',
'header1:xyz', 'x=1'],
# Flag before METHOD (already works).
['--offline', '--ignore-stdin', '-v', 'post', 'pie.dev/post',
'header1:xyz', 'x=1'],
])
def test_verbose_flag_position_keeps_request_items(self, args):
r = http(*args)
assert r.exit_status == ExitStatus.SUCCESS
assert 'header1: xyz' in r
assert '"x": "1"' in r


class TestNoOptions:

def test_valid_no_options(self, httpbin):
Expand Down
Loading