openstack
/
keystone
Code Issues Proposed changes

Merge "Use quotes consistently in token controller"

This commit is contained in:
Jenkins 2016-07-26 23:51:18 +00:00 committed by Gerrit Code Review
parent 9d01162c40 9c996413fd
commit 9d54eb33c1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
keystone/token/controllers.py
View File

@ -85,7 +85,7 @@ class Auth(controller.V2Controller):
raise exception.ValidationError(attribute='auth',
target='request body')
if "token" in auth:
if 'token' in auth:
# Try to authenticate using a token
auth_info = self._authenticate_token(request, auth)
else:
@ -165,9 +165,9 @@ class Auth(controller.V2Controller):
raise exception.ValidationError(
attribute='token', target='auth')
if "id" not in auth['token']:
if 'id' not in auth['token']:
raise exception.ValidationError(
attribute="id", target="token")
attribute='id', target='token')
old_token = auth['token']['id']
if len(old_token) > CONF.max_token_size:
@ -260,7 +260,7 @@ class Auth(controller.V2Controller):
raise exception.ValidationError(
attribute='passwordCredentials', target='auth')
if "password" not in auth['passwordCredentials']:
if 'password' not in auth['passwordCredentials']:
raise exception.ValidationError(
attribute='password', target='passwordCredentials')
@ -269,8 +269,8 @@ class Auth(controller.V2Controller):
raise exception.ValidationSizeError(
attribute='password', size=CONF.identity.max_password_length)
if (not auth['passwordCredentials'].get("userId") and
not auth['passwordCredentials'].get("username")):
if (not auth['passwordCredentials'].get('userId') and
not auth['passwordCredentials'].get('username')):
raise exception.ValidationError(
attribute='username or userId',
target='passwordCredentials')