From a3aae12d9c374189a8014f2f2506b83338e4b190 Mon Sep 17 00:00:00 2001
From: Matthias Lehmann <ml@qsensei.com>
Date: Wed, 5 Feb 2014 12:50:40 +0100
Subject: [PATCH] rename -ssl-cert and --ssl-key to --cert and --certkey

---
 httpie/cli.py    | 8 ++++----
 httpie/client.py | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/httpie/cli.py b/httpie/cli.py
index b087f783..13fb158d 100644
--- a/httpie/cli.py
+++ b/httpie/cli.py
@@ -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.
 
     """
diff --git a/httpie/client.py b/httpie/client.py
index 8514ece2..cccaf4c8 100644
--- a/httpie/client.py
+++ b/httpie/client.py
@@ -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,