Skip to content

Fix inconsistent argument parsing behavior across Python versions #1918

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

Draft
vinayK34 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix inconsistent argument parsing behavior across Python versions #1918

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
22 changes: 11 additions & 11 deletions httpie/cli/argparser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def __init__(self, max_help_position=6, *args, **kwargs):
super().__init__(*args, **kwargs)

def _split_lines(self, text, width):
text = dedent(text).strip() + '\n\n'
text = dedent(text).strip() + '\\n\\n'
return text.splitlines()

def add_usage(self, usage, actions, groups, prefix=None):
Expand All @@ -72,7 +72,7 @@ def add_usage(self, usage, actions, groups, prefix=None):
usage,
displayed_actions,
groups,
prefix="usage:\n "
prefix="usage:\\n "
)


Expand All @@ -94,7 +94,7 @@ def parse_args(
namespace=None
) -> argparse.Namespace:
self.env = env
self.args, no_options = self.parse_known_args(args, namespace)
self.args, no_options = self.parse_intermixed_args(args, namespace)
if self.args.debug:
self.args.traceback = True
self.has_stdin_data = (
Expand Down Expand Up @@ -126,9 +126,9 @@ def _print_message(self, message, file=None):


class HTTPieManagerArgumentParser(BaseHTTPieArgumentParser):
def parse_known_args(self, args=None, namespace=None):
def parse_intermixed_args(self, args=None, namespace=None):
try:
return super().parse_known_args(args, namespace)
return super().parse_intermixed_args(args, namespace)
except SystemExit as exc:
if not hasattr(self, 'root') and exc.code == 2: # Argument Parser Error
raise argparse.ArgumentError(None, None)
Expand Down 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_intermixed_args(args, namespace)
if self.args.debug:
self.args.traceback = True
self.has_stdin_data = (
Expand Down Expand Up @@ -213,7 +213,7 @@ def _process_url(self):
scheme = self.args.default_scheme + '://'

# See if we're using curl style shorthand for localhost (:3000/foo)
shorthand = re.match(r'^:(?!:)(\d*)(/?.*)$', self.args.url)
shorthand = re.match(r'^:(?!:)(\\d*)(/?.*)$', self.args.url)
if shorthand:
port = shorthand.group(1)
rest = shorthand.group(2)
Expand Down Expand Up @@ -306,7 +306,7 @@ def _process_auth(self):
if (not self.args.ignore_netrc
and self.args.auth is None
and plugin.netrc_parse):
# Only host needed, so it’s OK URL not finalized.
# Only host needed, so it's OK URL not finalized.
netrc_credentials = get_netrc_auth(self.args.url)
if netrc_credentials:
self.args.auth = AuthCredentials(
Expand Down Expand Up @@ -377,7 +377,7 @@ def _apply_no_options(self, no_options):
invalid.append(option)

if invalid:
self.error(f'unrecognized arguments: {" ".join(invalid)}')
self.error(f'unrecognized arguments: {\" \".join(invalid)}')

def _body_from_file(self, fd):
"""Read the data from a file-like object.
Expand Down Expand Up @@ -591,7 +591,7 @@ def print_usage(self, file):
whitelist.add(exception.args[0].option_strings[0])

usage_text = Text('usage', style='bold')
usage_text.append(':\n ')
usage_text.append(':\\n ')
usage_text.append(rich_help.to_usage(self.spec, whitelist=whitelist))
self.env.rich_error_console.print(usage_text)

Expand All @@ -610,4 +610,4 @@ def error(self, message):
'''.rstrip()
)
)
self.exit(2)
self.exit(2)
Loading