Remove session.construct
This was a horrible interface that was designed to allow all these variables to be passes to a client object and session to take what it needed. We no longer want to recommend this method so remove the function. Change-Id: I2337c395b343bfd607ae62ecf6542dfea678f390
This commit is contained in:
parent
76a3cba636
commit
2e23129e1f
|
@ -525,33 +525,6 @@ class Session(object):
|
|||
"""
|
||||
return self.request(url, 'PATCH', **kwargs)
|
||||
|
||||
@classmethod
|
||||
def construct(cls, kwargs):
|
||||
"""Handles constructing a session from the older
|
||||
:py:class:`~keystonauth.httpclient.HTTPClient` args as well as the
|
||||
new request-style arguments.
|
||||
|
||||
.. warning::
|
||||
*DEPRECATED*: This function is purely for bridging the gap between
|
||||
older client arguments and the session arguments that they relate
|
||||
to. It is not intended to be used as a generic Session Factory.
|
||||
|
||||
This function purposefully modifies the input kwargs dictionary so that
|
||||
the remaining kwargs dict can be reused and passed on to other
|
||||
functions without session arguments.
|
||||
|
||||
"""
|
||||
params = {}
|
||||
|
||||
for attr in ('verify', 'cacert', 'cert', 'key', 'insecure',
|
||||
'timeout', 'session', 'original_ip', 'user_agent'):
|
||||
try:
|
||||
params[attr] = kwargs.pop(attr)
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
return cls._make(**params)
|
||||
|
||||
@classmethod
|
||||
def _make(cls, insecure=False, verify=None, cacert=None, cert=None,
|
||||
key=None, **kwargs):
|
||||
|
|
|
@ -309,36 +309,6 @@ class RedirectTests(utils.TestCase):
|
|||
self.assertEqual(r.status_code, s.status_code)
|
||||
|
||||
|
||||
class ConstructSessionFromArgsTests(utils.TestCase):
|
||||
|
||||
KEY = 'keyfile'
|
||||
CERT = 'certfile'
|
||||
CACERT = 'cacert-path'
|
||||
|
||||
def _s(self, k=None, **kwargs):
|
||||
k = k or kwargs
|
||||
return client_session.Session.construct(k)
|
||||
|
||||
def test_verify(self):
|
||||
self.assertFalse(self._s(insecure=True).verify)
|
||||
self.assertTrue(self._s(verify=True, insecure=True).verify)
|
||||
self.assertFalse(self._s(verify=False, insecure=True).verify)
|
||||
self.assertEqual(self._s(cacert=self.CACERT).verify, self.CACERT)
|
||||
|
||||
def test_cert(self):
|
||||
tup = (self.CERT, self.KEY)
|
||||
self.assertEqual(self._s(cert=tup).cert, tup)
|
||||
self.assertEqual(self._s(cert=self.CERT, key=self.KEY).cert, tup)
|
||||
self.assertIsNone(self._s(key=self.KEY).cert)
|
||||
|
||||
def test_pass_through(self):
|
||||
value = 42 # only a number because timeout needs to be
|
||||
for key in ['timeout', 'session', 'original_ip', 'user_agent']:
|
||||
args = {key: value}
|
||||
self.assertEqual(getattr(self._s(args), key), value)
|
||||
self.assertNotIn(key, args)
|
||||
|
||||
|
||||
class AuthPlugin(base.BaseAuthPlugin):
|
||||
"""Very simple debug authentication plugin.
|
||||
|
||||
|
|
Loading…
Reference in New Issue