Merge "Backslash continuation cleanup"

5 files changed, 61 insertions, 54 deletions

diff --git a/keystone/common/openssl.py b/keystone/common/openssl.py
index 952c377e..b2f61963 100644
--- a/keystone/common/openssl.py
+++ b/keystone/common/openssl.py
@@ -24,9 +24,9 @@ from keystone import config
 
 
 CONF = config.CONF
-DIR_PERMS = stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR | \
-    stat.S_IRGRP | stat.S_IXGRP | \
-    stat.S_IROTH | stat.S_IXOTH
+DIR_PERMS = (stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR |
+             stat.S_IRGRP | stat.S_IXGRP |
+             stat.S_IROTH | stat.S_IXOTH)
 CERT_PERMS = stat.S_IRUSR | stat.S_IRGRP | stat.S_IROTH
 PRIV_PERMS = stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR
 DEFAULT_SUBJECT = "/C=US/ST=Unset/L=Unset/O=Unset/CN=www.example.com"
diff --git a/keystone/contrib/ec2/backends/sql.py b/keystone/contrib/ec2/backends/sql.py
index c3af4648..a1a4867a 100644
--- a/keystone/contrib/ec2/backends/sql.py
+++ b/keystone/contrib/ec2/backends/sql.py
@@ -35,16 +35,17 @@ class Ec2Credential(sql.ModelBase, sql.DictBase):
 class Ec2(sql.Base):
     def get_credential(self, credential_id):
         session = self.get_session()
-        credential_ref = session.query(Ec2Credential)\
-                                .filter_by(access=credential_id).first()
+        query = session.query(Ec2Credential)
+        query = query.filter_by(access=credential_id)
+        credential_ref = query.first()
         if not credential_ref:
             return
         return credential_ref.to_dict()
 
     def list_credentials(self, user_id):
         session = self.get_session()
-        credential_refs = session.query(Ec2Credential)\
-                                 .filter_by(user_id=user_id)
+        query = session.query(Ec2Credential)
+        credential_refs = query.filter_by(user_id=user_id)
         return [x.to_dict() for x in credential_refs]
 
     # CRUD
@@ -58,8 +59,9 @@ class Ec2(sql.Base):
 
     def delete_credential(self, credential_id):
         session = self.get_session()
-        credential_ref = session.query(Ec2Credential)\
-                                .filter_by(access=credential_id).first()
+        query = session.query(Ec2Credential)
+        query = query.filter_by(access=credential_id)
+        credential_ref = query.first()
         with session.begin():
             session.delete(credential_ref)
             session.flush()
diff --git a/keystone/identity/backends/sql.py b/keystone/identity/backends/sql.py
index a3c8d1f1..ebacf973 100644
--- a/keystone/identity/backends/sql.py
+++ b/keystone/identity/backends/sql.py
@@ -201,11 +201,10 @@ class Identity(sql.Base, identity.Driver):
     def get_tenant_users(self, tenant_id):
         session = self.get_session()
         self.get_tenant(tenant_id)
-        user_refs = session.query(User)\
-            .join(UserTenantMembership)\
-            .filter(UserTenantMembership.tenant_id ==
-                    tenant_id)\
-            .all()
+        query = session.query(User)
+        query = query.join(UserTenantMembership)
+        query = query.filter(UserTenantMembership.tenant_id == tenant_id)
+        user_refs = query.all()
         return [_filter_user(user_ref.to_dict()) for user_ref in user_refs]
 
     def _get_user(self, user_id):
@@ -230,10 +229,10 @@ class Identity(sql.Base, identity.Driver):
 
     def get_metadata(self, user_id, tenant_id):
         session = self.get_session()
-        metadata_ref = session.query(Metadata)\
-                              .filter_by(user_id=user_id)\
-                              .filter_by(tenant_id=tenant_id)\
-                              .first()
+        query = session.query(Metadata)
+        query = query.filter_by(user_id=user_id)
+        query = query.filter_by(tenant_id=tenant_id)
+        metadata_ref = query.first()
         if metadata_ref is None:
             raise exception.MetadataNotFound()
         return metadata_ref.data
@@ -260,10 +259,10 @@ class Identity(sql.Base, identity.Driver):
         session = self.get_session()
         self.get_tenant(tenant_id)
         self.get_user(user_id)
-        q = session.query(UserTenantMembership)\
-                   .filter_by(user_id=user_id)\
-                   .filter_by(tenant_id=tenant_id)
-        rv = q.first()
+        query = session.query(UserTenantMembership)
+        query = query.filter_by(user_id=user_id)
+        query = query.filter_by(tenant_id=tenant_id)
+        rv = query.first()
         if rv:
             return
 
@@ -276,10 +275,10 @@ class Identity(sql.Base, identity.Driver):
         session = self.get_session()
         self.get_tenant(tenant_id)
         self.get_user(user_id)
-        membership_ref = session.query(UserTenantMembership)\
-                                .filter_by(user_id=user_id)\
-                                .filter_by(tenant_id=tenant_id)\
-                                .first()
+        query = session.query(UserTenantMembership)
+        query = query.filter_by(user_id=user_id)
+        query = query.filter_by(tenant_id=tenant_id)
+        membership_ref = query.first()
         if membership_ref is None:
             raise exception.NotFound('User not found in tenant')
         with session.begin():
@@ -294,9 +293,9 @@ class Identity(sql.Base, identity.Driver):
     def get_tenants_for_user(self, user_id):
         session = self.get_session()
         self.get_user(user_id)
-        membership_refs = session.query(UserTenantMembership)\
-                                 .filter_by(user_id=user_id)\
-                                 .all()
+        query = session.query(UserTenantMembership)
+        query = query.filter_by(user_id=user_id)
+        membership_refs = query.all()
         return [x.tenant_id for x in membership_refs]
 
     def get_roles_for_user_and_tenant(self, user_id, tenant_id):
@@ -386,10 +385,12 @@ class Identity(sql.Base, identity.Driver):
     def delete_user(self, user_id):
         session = self.get_session()
         with session.begin():
-            session.query(UserTenantMembership)\
-                   .filter_by(user_id=user_id).delete(False)
-            session.query(Metadata)\
-                   .filter_by(user_id=user_id).delete(False)
+            query = session.query(UserTenantMembership)
+            query = query.filter_by(user_id=user_id)
+            query.delete(False)
+            query = session.query(Metadata)
+            query = query.filter_by(user_id=user_id)
+            query.delete(False)
             if not session.query(User).filter_by(id=user_id).delete(False):
                 raise exception.UserNotFound(user_id=user_id)
 
@@ -425,10 +426,12 @@ class Identity(sql.Base, identity.Driver):
     def delete_tenant(self, tenant_id):
         session = self.get_session()
         with session.begin():
-            session.query(UserTenantMembership)\
-                   .filter_by(tenant_id=tenant_id).delete(False)
-            session.query(Metadata)\
-                   .filter_by(tenant_id=tenant_id).delete(False)
+            query = session.query(UserTenantMembership)
+            query = query.filter_by(tenant_id=tenant_id)
+            query.delete(False)
+            query = session.query(Metadata)
+            query = query.filter_by(tenant_id=tenant_id)
+            query.delete(False)
             if not session.query(Tenant).filter_by(id=tenant_id).delete(False):
                 raise exception.TenantNotFound(tenant_id=tenant_id)
 
@@ -446,10 +449,10 @@ class Identity(sql.Base, identity.Driver):
     def update_metadata(self, user_id, tenant_id, metadata):
         session = self.get_session()
         with session.begin():
-            metadata_ref = session.query(Metadata)\
-                                  .filter_by(user_id=user_id)\
-                                  .filter_by(tenant_id=tenant_id)\
-                                  .first()
+            query = session.query(Metadata)
+            query = query.filter_by(user_id=user_id)
+            query = query.filter_by(tenant_id=tenant_id)
+            metadata_ref = query.first()
             data = metadata_ref.data.copy()
             for k in metadata:
                 data[k] = metadata[k]
diff --git a/keystone/middleware/auth_token.py b/keystone/middleware/auth_token.py
index 1f565eb3..5d24e251 100644
--- a/keystone/middleware/auth_token.py
+++ b/keystone/middleware/auth_token.py
@@ -242,8 +242,8 @@ class AuthProtocol(object):
         self.token_cache_time = int(self._conf_get('token_cache_time'))
         self._token_revocation_list = None
         self._token_revocation_list_fetched_time = None
-        self.token_revocation_list_cache_timeout = \
-            datetime.timedelta(seconds=0)
+        cache_timeout = datetime.timedelta(seconds=0)
+        self.token_revocation_list_cache_timeout = cache_timeout
         if memcache_servers:
             try:
                 import memcache
@@ -747,8 +747,8 @@ class AuthProtocol(object):
 
     @property
     def token_revocation_list(self):
-        timeout = self.token_revocation_list_fetched_time +\
-            self.token_revocation_list_cache_timeout
+        timeout = (self.token_revocation_list_fetched_time +
+                   self.token_revocation_list_cache_timeout)
         list_is_current = timeutils.utcnow() < timeout
         if list_is_current:
             # Load the list from disk if required
diff --git a/keystone/token/backends/sql.py b/keystone/token/backends/sql.py
index 02e89476..d7798db5 100644
--- a/keystone/token/backends/sql.py
+++ b/keystone/token/backends/sql.py
@@ -53,9 +53,9 @@ class Token(sql.Base, token.Driver):
     # Public interface
     def get_token(self, token_id):
         session = self.get_session()
-        token_ref = session.query(TokenModel)\
-            .filter_by(id=self.token_to_key(token_id),
-                       valid=True).first()
+        query = session.query(TokenModel)
+        query = query.filter_by(id=self.token_to_key(token_id), valid=True)
+        token_ref = query.first()
         now = datetime.datetime.utcnow()
         if token_ref and (not token_ref.expires or now < token_ref.expires):
             return token_ref.to_dict()
@@ -99,9 +99,10 @@ class Token(sql.Base, token.Driver):
         session = self.get_session()
         tokens = []
         now = timeutils.utcnow()
-        for token_ref in session.query(TokenModel)\
-                                .filter(TokenModel.expires > now)\
-                                .filter_by(valid=True):
+        query = session.query(TokenModel)
+        query = query.filter(TokenModel.expires > now)
+        token_references = query.filter_by(valid=True)
+        for token_ref in token_references:
             token_ref_dict = token_ref.to_dict()
             if 'user' not in token_ref_dict:
                 continue
@@ -119,9 +120,10 @@ class Token(sql.Base, token.Driver):
         session = self.get_session()
         tokens = []
         now = timeutils.utcnow()
-        for token_ref in session.query(TokenModel)\
-                                .filter(TokenModel.expires > now)\
-                                .filter_by(valid=False):
+        query = session.query(TokenModel)
+        query = query.filter(TokenModel.expires > now)
+        token_references = query.filter_by(valid=False)
+        for token_ref in token_references:
             record = {
                 'id': token_ref['id'],
                 'expires': token_ref['expires'],