consistent naming, #446

3 files changed, 22 insertions, 19 deletions

diff --git a/redis/client.py b/redis/client.py
index c933221..b0f8c46 100755
--- a/redis/client.py
+++ b/redis/client.py
@@ -423,10 +423,10 @@ class StrictRedis(object):
                 if ssl:
                     kwargs.update({
                         'connection_class': SSLConnection,
-                        'keyfile': ssl_keyfile,
-                        'certfile': ssl_certfile,
-                        'cert_reqs': ssl_cert_reqs,
-                        'ca_certs': ssl_ca_certs,
+                        'ssl_keyfile': ssl_keyfile,
+                        'ssl_certfile': ssl_certfile,
+                        'ssl_cert_reqs': ssl_cert_reqs,
+                        'ssl_ca_certs': ssl_ca_certs,
                     })
             connection_pool = ConnectionPool(**kwargs)
         self.connection_pool = connection_pool
diff --git a/redis/connection.py b/redis/connection.py
index f7297a0..623f44d 100755
--- a/redis/connection.py
+++ b/redis/connection.py
@@ -591,29 +591,30 @@ class Connection(object):
 class SSLConnection(Connection):
     description_format = "SSLConnection<host=%(host)s,port=%(port)s,db=%(db)s>"
 
-    def __init__(self, keyfile=None, certfile=None, cert_reqs=None,
-                 ca_certs=None, **kwargs):
+    def __init__(self, ssl_keyfile=None, ssl_certfile=None, ssl_cert_reqs=None,
+                 ssl_ca_certs=None, **kwargs):
         if not ssl_available:
             raise RedisError("Python wasn't built with SSL support")
 
         super(SSLConnection, self).__init__(**kwargs)
 
-        self.keyfile = keyfile
-        self.certfile = certfile
-        if cert_reqs is None:
-            cert_reqs = ssl.CERT_NONE
-        elif isinstance(cert_reqs, basestring):
+        self.keyfile = ssl_keyfile
+        self.certfile = ssl_certfile
+        if ssl_cert_reqs is None:
+            ssl_cert_reqs = ssl.CERT_NONE
+        elif isinstance(ssl_cert_reqs, basestring):
             CERT_REQS = {
                 'none': ssl.CERT_NONE,
                 'optional': ssl.CERT_OPTIONAL,
                 'required': ssl.CERT_REQUIRED
             }
-            if cert_reqs not in CERT_REQS:
+            if ssl_cert_reqs not in CERT_REQS:
                 raise RedisError(
-                    "Invalid SSL Certificate Required Flag: %s" % cert_reqs)
-            cert_reqs = CERT_REQS[cert_reqs]
-        self.cert_reqs = cert_reqs
-        self.ca_certs = ca_certs
+                    "Invalid SSL Certificate Requirements Flag: %s" %
+                    ssl_cert_reqs)
+            ssl_cert_reqs = CERT_REQS[ssl_cert_reqs]
+        self.cert_reqs = ssl_cert_reqs
+        self.ca_certs = ssl_ca_certs
 
     def _connect(self):
         "Wrap the socket with SSL support"
diff --git a/tests/test_connection_pool.py b/tests/test_connection_pool.py
index 934636b..55ccce1 100644
--- a/tests/test_connection_pool.py
+++ b/tests/test_connection_pool.py
@@ -305,13 +305,15 @@ class TestSSLConnectionURLParsing(object):
     @pytest.mark.skipif(not ssl_available, reason="SSL not installed")
     def test_cert_reqs_options(self):
         import ssl
-        pool = redis.ConnectionPool.from_url('rediss://?cert_reqs=none')
+        pool = redis.ConnectionPool.from_url('rediss://?ssl_cert_reqs=none')
         assert pool.get_connection('_').cert_reqs == ssl.CERT_NONE
 
-        pool = redis.ConnectionPool.from_url('rediss://?cert_reqs=optional')
+        pool = redis.ConnectionPool.from_url(
+            'rediss://?ssl_cert_reqs=optional')
         assert pool.get_connection('_').cert_reqs == ssl.CERT_OPTIONAL
 
-        pool = redis.ConnectionPool.from_url('rediss://?cert_reqs=required')
+        pool = redis.ConnectionPool.from_url(
+            'rediss://?ssl_cert_reqs=required')
         assert pool.get_connection('_').cert_reqs == ssl.CERT_REQUIRED