Merge "Back to zero PEP8 violations"

4 files changed, 9 insertions, 8 deletions

diff --git a/keystone/logic/types/auth.py b/keystone/logic/types/auth.py
index a2a9b375..ef809ce9 100755
--- a/keystone/logic/types/auth.py
+++ b/keystone/logic/types/auth.py
@@ -228,9 +228,9 @@ class AuthData(object):
                         endpoint.set("region", base_url.region)
                     for url_kind in AuthData.url_kinds:
                         base_url_item = getattr(base_url, url_kind + "_url")
-                        if base_url_item:                            
-                            endpoint.set(url_kind + "URL",
-                                base_url_item.replace('%tenant_id%', self.token.tenant_id) \
+                        if base_url_item:
+                            endpoint.set(url_kind + "URL", base_url_item.\
+                                replace('%tenant_id%', self.token.tenant_id)
                                 if self.token.tenant_id else base_url_item)
                     service.append(endpoint)
                 service_catalog.append(service)
@@ -260,8 +260,8 @@ class AuthData(object):
                     for url_kind in AuthData.url_kinds:
                         base_url_item = getattr(base_url, url_kind + "_url")
                         if base_url_item:
-                            endpoint[url_kind + "URL"] = base_url_item.replace( \
-                                '%tenant_id%', self.token.tenant_id)            \
+                            endpoint[url_kind + "URL"] = base_url_item.\
+                                replace('%tenant_id%', self.token.tenant_id) \
                                 if self.token.tenant_id else base_url_item
                     endpoints.append(endpoint)
                 service_catalog[key] = endpoints
diff --git a/keystone/logic/types/user.py b/keystone/logic/types/user.py
index be64f1ea..b4a5f480 100755
--- a/keystone/logic/types/user.py
+++ b/keystone/logic/types/user.py
@@ -23,7 +23,8 @@ from keystone.logic.types import fault
 class User(object):
     """Document me!"""
 
-    def __init__(self, password, user_id, tenant_id, email, enabled, tenant_roles=None):
+    def __init__(self, password, user_id, tenant_id, email, enabled,
+            tenant_roles=None):
         self.user_id = user_id
         self.tenant_id = tenant_id
         self.password = password
diff --git a/keystone/middleware/nova_auth_token.py b/keystone/middleware/nova_auth_token.py
index 9461a3f4..229ec472 100644
--- a/keystone/middleware/nova_auth_token.py
+++ b/keystone/middleware/nova_auth_token.py
@@ -66,7 +66,7 @@ class KeystoneAuthShim(wsgi.Middleware):
         roles = [r.strip() for r in req.headers.get('X_ROLE', '').split(',')]
 
         # set user admin-ness to keystone admin-ness
-        # FIXME: keystone-admin-role value from keystone.conf is not 
+        # FIXME: keystone-admin-role value from keystone.conf is not
         # used neither here nor in glance_auth_token!
         roles = [r.strip() for r in req.headers.get('X_ROLE', '').split(',')]
         is_admin = 'Admin' in roles
diff --git a/keystone/middleware/swift_auth.py b/keystone/middleware/swift_auth.py
index 567c4000..f92b2d76 100755
--- a/keystone/middleware/swift_auth.py
+++ b/keystone/middleware/swift_auth.py
@@ -226,7 +226,7 @@ class AuthProtocol(object):
         # TODO(Ziad): add groups back in
         identity = {'user': identity_info['auth']['user']['username'],
                     'tenant': tenant,
-                    'roles':roles}
+                    'roles': roles}
 
         return identity