Deprecate use of cert and key

There was a comment to deprecate creating a Session with cert and
key rather than a tuple to cert.

Also, fixed places where the deprecated usage was being used.

bp deprecations

Change-Id: I3596635bbc5611dd002a8beb063540a8c284c192

1 files changed, 9 insertions, 6 deletions

diff --git a/keystoneclient/session.py b/keystoneclient/session.py
index 5ec8a67..e542edf 100644
--- a/keystoneclient/session.py
+++ b/keystoneclient/session.py
@@ -574,8 +574,11 @@ class Session(object):
                 verify = cacert or True
 
         if cert and key:
-            # passing cert and key together is deprecated in favour of the
-            # requests lib form of having the cert and key as a tuple
+            warnings.warn(
+                'Passing cert and key together is deprecated as of the 1.7.0 '
+                'release in favor of the requests library form of having the '
+                'cert and key as a tuple and may be removed in the 2.0.0 '
+                'release.', DeprecationWarning)
             cert = (cert, key)
 
         return cls(verify=verify, cert=cert, **kwargs)
@@ -846,8 +849,8 @@ class Session(object):
 
         kwargs['insecure'] = c.insecure
         kwargs['cacert'] = c.cafile
-        kwargs['cert'] = c.certfile
-        kwargs['key'] = c.keyfile
+        if c.certfile and c.keyfile:
+            kwargs['cert'] = (c.certfile, c.keyfile)
         kwargs['timeout'] = c.timeout
 
         return cls._make(**kwargs)
@@ -904,8 +907,8 @@ class Session(object):
         """
         kwargs['insecure'] = args.insecure
         kwargs['cacert'] = args.os_cacert
-        kwargs['cert'] = args.os_cert
-        kwargs['key'] = args.os_key
+        if args.os_cert and args.os_key:
+            kwargs['cert'] = (args.os_cert, args.os_key)
         kwargs['timeout'] = args.timeout
 
         return cls._make(**kwargs)