openstack/python-keystoneclient
Code Issues Proposed changes

Merge "rm improper assert syntax"

Browse Source
This commit is contained in:
Jenkins
2013-07-27 14:57:07 +00:00
committed by Gerrit Code Review
parent fd8f05350b 39158466d3
commit 9aec00322f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystoneclient/middleware/auth_token.py
View File

@@ -667,8 +667,8 @@ class AuthProtocol(object):
try: try:
token = data['access']['token']['id'] token = data['access']['token']['id']
expiry = data['access']['token']['expires'] expiry = data['access']['token']['expires']
assert token if not (token and expiry):
assert expiry raise AssertionError('invalid token or expire')
datetime_expiry = timeutils.parse_isotime(expiry) datetime_expiry = timeutils.parse_isotime(expiry)
return (token, timeutils.normalize_time(datetime_expiry)) return (token, timeutils.normalize_time(datetime_expiry))
except (AssertionError, KeyError): except (AssertionError, KeyError):