holm/httpie-cli
1
1
Fork 0
forked from extern/httpie-cli
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #401 from lgarron/default-scheme

Browse Source 
Add a --default-scheme argument.
This commit is contained in:
Jakub Roztočil 2016-07-02 12:32:07 +02:00 committed by GitHub
commit c3735d0422
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
httpie/cli.py
View File

@ -89,6 +89,7 @@ positional.add_argument(
metavar='URL', metavar='URL',
help=""" help="""
The scheme defaults to 'http://' if the URL does not include one. The scheme defaults to 'http://' if the URL does not include one.
(You can override this with: --default-scheme https)
You can also use a shorthand for localhost You can also use a shorthand for localhost
@ -611,6 +612,15 @@ troubleshooting.add_argument(
""" """
) )
troubleshooting.add_argument(
'--default-scheme',
choices=["http", "https"],
default="http",
help="""
Default scheme to use if not specified in the URL.
"""
)
troubleshooting.add_argument( troubleshooting.add_argument(
'--debug', '--debug',
action='store_true', action='store_true',

2
httpie/input.py
View File

@ -153,7 +153,7 @@ class HTTPieArgumentParser(ArgumentParser):
if not self.args.ignore_stdin and not env.stdin_isatty: if not self.args.ignore_stdin and not env.stdin_isatty:
self._body_from_file(self.env.stdin) self._body_from_file(self.env.stdin)
if not URL_SCHEME_RE.match(self.args.url): if not URL_SCHEME_RE.match(self.args.url):
scheme = HTTP scheme = self.args.default_scheme + "://"
# See if we're using curl style shorthand for localhost (:3000/foo) # 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)