Merge "rm improper assert syntax"

This commit is contained in:
Jenkins
2013-07-27 14:57:07 +00:00
committed by Gerrit Code Review

View File

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