extern/httpie-cli
1
0
Fork 1
mirror of https://github.com/httpie/cli.git synced 2025-02-16 17:40:51 +01:00
Code Issues 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( network.add_argument(
'--ssl-cert', '--cert',
default=None, default=None,
type=readable_file_arg, type=readable_file_arg,
help=""" help="""
You can specify a local cert to use as client side SSL certificate. 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 This file may either contain both private key and certificate or you may
specify --ssl-key separately. specify --certkey separately.
""" """
) )
network.add_argument( network.add_argument(
'--ssl-key', '--certkey',
default=None, default=None,
type=readable_file_arg, type=readable_file_arg,
help=""" 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. 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) credentials = auth_plugin.get_auth(args.auth.key, args.auth.value)
cert = None cert = None
if args.ssl_cert: if args.cert:
cert = args.ssl_cert cert = args.cert
if args.ssl_key: if args.certkey:
cert = (cert, args.ssl_key) cert = (cert, args.certkey)
kwargs = { kwargs = {
'stream': True, 'stream': True,