diff options
| author | Dean Troyer <dtroyer@gmail.com> | 2012-11-16 17:43:05 -0600 |
|---|---|---|
| committer | Dean Troyer <dtroyer@gmail.com> | 2012-12-18 15:30:43 -0600 |
| commit | 51dc6a0cef657cf9fa110da11d81d1c3f13194fa (patch) | |
| tree | 80bda5aa2974db6102a60b06ea7422e107034940 /keystoneclient/generic | |
| parent | 581264757e5ac8c5313acc35e5dc94247c7a80ff (diff) | |
| download | python-keystoneclient-51dc6a0cef657cf9fa110da11d81d1c3f13194fa.tar.gz | |
Use requests module for HTTP/HTTPS
* Implement correct certificate verification
* Add requests to tools/pip-requires
* Fix OS_CACERT env var help text
* Add info to README
* Rework tests to use requests
Pinned requests module to < 1.0 as 1.0.2 is now current in pipi
as of 17Dec2012.
Change-Id: I120d2c12d6f20ebe2fd7182ec8988cc73f623b80
Diffstat (limited to 'keystoneclient/generic')
| -rw-r--r-- | keystoneclient/generic/client.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/keystoneclient/generic/client.py b/keystoneclient/generic/client.py index 7fe5e0f..4818ddf 100644 --- a/keystoneclient/generic/client.py +++ b/keystoneclient/generic/client.py @@ -84,7 +84,7 @@ class Client(client.HTTPClient): resp, body = httpclient.request(url, "GET", headers={'Accept': 'application/json'}) - if resp.status in (200, 204): # in some cases we get No Content + if resp.status_code in (200, 204): # some cases we get No Content try: results = {} if 'version' in body: @@ -113,10 +113,10 @@ class Client(client.HTTPClient): return results except KeyError: raise exceptions.AuthorizationFailure() - elif resp.status == 305: + elif resp.status_code == 305: return self._check_keystone_versions(resp['location']) else: - raise exceptions.from_response(resp, body) + raise exceptions.from_response(resp, resp.text) except Exception as e: _logger.exception(e) @@ -145,7 +145,7 @@ class Client(client.HTTPClient): resp, body = httpclient.request("%sextensions" % url, "GET", headers={'Accept': 'application/json'}) - if resp.status in (200, 204): # in some cases we get No Content + if resp.status_code in (200, 204): # some cases we get No Content try: results = {} if 'extensions' in body: @@ -171,10 +171,10 @@ class Client(client.HTTPClient): return results except KeyError: raise exceptions.AuthorizationFailure() - elif resp.status == 305: + elif resp.status_code == 305: return self._check_keystone_extensions(resp['location']) else: - raise exceptions.from_response(resp, body) + raise exceptions.from_response(resp, resp.text) except Exception as e: _logger.exception(e) |