diff options
| author | Eoghan Glynn <eglynn@redhat.com> | 2013-06-21 11:33:33 +0000 |
|---|---|---|
| committer | Eoghan Glynn <eglynn@redhat.com> | 2013-06-21 12:39:22 +0100 |
| commit | ff77aeea56872be38914c851926af1fb504dba5f (patch) | |
| tree | 216e64216219b31c7c38945143c64373b8e1d5be /ceilometerclient/common | |
| parent | aa5330b48cf3165a775e13fc2cc3117a05b31896 (diff) | |
| download | python-ceilometerclient-ff77aeea56872be38914c851926af1fb504dba5f.tar.gz | |
Make authenticated client easier to consume.
Encapsulate keystone logic in an convenience method.
Change-Id: I0a048e02f57d657b8b414a76d759ceb9e0e025df
Diffstat (limited to 'ceilometerclient/common')
| -rw-r--r-- | ceilometerclient/common/http.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ceilometerclient/common/http.py b/ceilometerclient/common/http.py index 2a813d2..e0ad393 100644 --- a/ceilometerclient/common/http.py +++ b/ceilometerclient/common/http.py @@ -58,7 +58,8 @@ class HTTPClient(object): parts = urlparse.urlparse(endpoint) _args = (parts.hostname, parts.port, parts.path) - _kwargs = {'timeout': float(kwargs.get('timeout', 600))} + _kwargs = {'timeout': (float(kwargs.get('timeout')) + if kwargs.get('timeout') else 600)} if parts.scheme == 'https': _class = VerifiedHTTPSConnection |