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

rename -ssl-cert and --ssl-key to --cert and --certkey

Browse Source
This commit is contained in:
Matthias Lehmann 2014-02-05 12:50:40 +01:00
parent d4363a560d
commit a3aae12d9c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
httpie/cli.py
View File

@ -467,23 +467,23 @@ network.add_argument(
)
network.add_argument(
'--ssl-cert',
'--cert',
default=None,
type=readable_file_arg,
help="""
You can specify a local cert to use as client side SSL certificate.
This file may either contain both private key and certificate or you may
specify --ssl-key separately.
specify --certkey separately.
"""
)
network.add_argument(
'--ssl-key',
'--certkey',
default=None,
type=readable_file_arg,
help="""
The private key to use with SSL. Only needed if --ssl-cert is given and the
The private key to use with SSL. Only needed if --cert is given and the
certificate file does not contain the private key.
"""

8
httpie/client.py
View File

@ -74,10 +74,10 @@ def get_requests_kwargs(args):
credentials = auth_plugin.get_auth(args.auth.key, args.auth.value)
cert = None
if args.ssl_cert:
cert = args.ssl_cert
if args.ssl_key:
cert = (cert, args.ssl_key)
if args.cert:
cert = args.cert
if args.certkey:
cert = (cert, args.certkey)
kwargs = {
'stream': True,