diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-21 16:30:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-21 16:30:38 +0000 |
| commit | 33d107aa1d3e1aa2c188f9df7338a1e7d97a4ed2 (patch) | |
| tree | 5017fc5688bc1ffa46574b8ff49f699088855aa7 | |
| parent | 014ccd9a62fe8a0976d3d455181841eb04499298 (diff) | |
| parent | 7a7a0c61f162f142669303f4a5632e09190b82c2 (diff) | |
| download | keystone-folsom-1.tar.gz | |
Merge "Backslash continuation removal (Keystone folsom-1)"folsom-1
| -rw-r--r-- | keystone/identity/backends/ldap/core.py | 4 | ||||
| -rw-r--r-- | keystone/identity/backends/sql.py | 27 | ||||
| -rw-r--r-- | keystone/middleware/s3_token.py | 7 | ||||
| -rw-r--r-- | keystone/token/backends/sql.py | 6 |
4 files changed, 23 insertions, 21 deletions
diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py index 8c3a57299..7dc3bbbbf 100644 --- a/keystone/identity/backends/ldap/core.py +++ b/keystone/identity/backends/ldap/core.py @@ -321,8 +321,8 @@ class UserApi(common_ldap.BaseLdap, ApiShimMixin): self.role_api.rolegrant_delete(ref.id) def get_by_email(self, email): - users = self.get_all('(mail=%s)' % \ - (ldap_filter.escape_filter_chars(email),)) + users = self.get_all('(mail=%s)' % + (ldap_filter.escape_filter_chars(email),)) try: return users[0] except IndexError: diff --git a/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py index 51110fdf7..46518f8ab 100644 --- a/keystone/identity/backends/sql.py +++ b/keystone/identity/backends/sql.py @@ -176,9 +176,10 @@ class Identity(sql.Base, identity.Driver): def get_tenant_users(self, tenant_id): session = self.get_session() user_refs = session.query(User)\ - .join(UserTenantMembership)\ - .filter(UserTenantMembership.tenant_id == tenant_id)\ - .all() + .join(UserTenantMembership)\ + .filter(UserTenantMembership.tenant_id == + tenant_id)\ + .all() return [_filter_user(user_ref.to_dict()) for user_ref in user_refs] def _get_user(self, user_id): @@ -256,8 +257,8 @@ class Identity(sql.Base, identity.Driver): def get_tenants_for_user(self, user_id): session = self.get_session() membership_refs = session.query(UserTenantMembership)\ - .filter_by(user_id=user_id)\ - .all() + .filter_by(user_id=user_id)\ + .all() return [x.tenant_id for x in membership_refs] def get_roles_for_user_and_tenant(self, user_id, tenant_id): @@ -329,11 +330,11 @@ class Identity(sql.Base, identity.Driver): session = self.get_session() user_ref = session.query(User).filter_by(id=user_id).first() membership_refs = session.query(UserTenantMembership)\ - .filter_by(user_id=user_id)\ - .all() + .filter_by(user_id=user_id)\ + .all() metadata_refs = session.query(Metadata)\ - .filter_by(user_id=user_id)\ - .all() + .filter_by(user_id=user_id)\ + .all() with session.begin(): if membership_refs: @@ -378,11 +379,11 @@ class Identity(sql.Base, identity.Driver): session = self.get_session() tenant_ref = session.query(Tenant).filter_by(id=tenant_id).first() membership_refs = session.query(UserTenantMembership)\ - .filter_by(tenant_id=tenant_id)\ - .all() + .filter_by(tenant_id=tenant_id)\ + .all() metadata_refs = session.query(Metadata)\ - .filter_by(tenant_id=tenant_id)\ - .all() + .filter_by(tenant_id=tenant_id)\ + .all() with session.begin(): if membership_refs: diff --git a/keystone/middleware/s3_token.py b/keystone/middleware/s3_token.py index d22267716..19953acda 100644 --- a/keystone/middleware/s3_token.py +++ b/keystone/middleware/s3_token.py @@ -76,9 +76,10 @@ class S3Token(object): resp = webob.Response(content_type='text/xml') resp.status = error_table[code][0] resp.body = error_table[code][1] - resp.body = '<?xml version="1.0" encoding="UTF-8"?>\r\n<Error>\r\n ' \ - '<Code>%s</Code>\r\n <Message>%s</Message>\r\n</Error>\r\n' \ - % (code, error_table[code][1]) + resp.body = ('<?xml version="1.0" encoding="UTF-8"?>\r\n' + '<Error>\r\n <Code>%s</Code>\r\n ' + '<Message>%s</Message>\r\n</Error>\r\n' % + (code, error_table[code][1])) return resp def _json_request(self, creds_json): diff --git a/keystone/token/backends/sql.py b/keystone/token/backends/sql.py index 543f96281..cf57dfa9c 100644 --- a/keystone/token/backends/sql.py +++ b/keystone/token/backends/sql.py @@ -73,8 +73,8 @@ class Token(sql.Base, token.Driver): def delete_token(self, token_id): session = self.get_session() token_ref = session.query(TokenModel)\ - .filter_by(id=token_id)\ - .first() + .filter_by(id=token_id)\ + .first() if not token_ref: raise exception.TokenNotFound(token_id=token_id) @@ -87,7 +87,7 @@ class Token(sql.Base, token.Driver): tokens = [] now = datetime.datetime.utcnow() for token_ref in session.query(TokenModel)\ - .filter(TokenModel.expires > now): + .filter(TokenModel.expires > now): token_ref_dict = token_ref.to_dict() if 'user' not in token_ref_dict: continue |