From e4348aa3d28f26b354326e056dc26c293963ea7f Mon Sep 17 00:00:00 2001 From: Eoghan Glynn Date: Fri, 2 Aug 2013 17:07:28 +0100 Subject: [PATCH] Handle case where os_auth_token is set to '' Properly handle case (as in CLI) where os_auth_token is set, but to an empty string. Change-Id: I7e96bf22e2a91e0e3ec783b406fd05e4138860c8 --- ceilometerclient/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index 677e4c4a..74884799 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -74,7 +74,7 @@ def get_client(api_version, **kwargs): } _ksclient = _get_ksclient(**ks_kwargs) token = ((lambda: kwargs.get('os_auth_token')) - if 'os_auth_token' in kwargs + if kwargs.get('os_auth_token') else (lambda: _ksclient.auth_token)) endpoint = kwargs.get('ceilometer_url') or \