diff options
| author | Zhongyue Luo <zhongyue.nah@intel.com> | 2012-09-12 10:28:18 +0800 |
|---|---|---|
| committer | Zhongyue Luo <zhongyue.nah@intel.com> | 2012-09-19 11:00:55 +0800 |
| commit | 4f39aa2b94efaed08f43ef8a01067f89e2d2b192 (patch) | |
| tree | 5f30a278cc8cd48e18c106514309740447059640 /keystone/token | |
| parent | f261f718eebdfc60cdf9ce1f227c43f462dc163c (diff) | |
| download | keystone-4f39aa2b94efaed08f43ef8a01067f89e2d2b192.tar.gz keystone-4f39aa2b94efaed08f43ef8a01067f89e2d2b192.tar.xz keystone-4f39aa2b94efaed08f43ef8a01067f89e2d2b192.zip | |
Backslash continuation cleanup
Removed unnecessary backslash continuations
Added backslash continuation rules to HACKING.rst
Change-Id: Id91da5b7e9be4d4587dded95fe7a0415240213ec
Diffstat (limited to 'keystone/token')
| -rw-r--r-- | keystone/token/backends/sql.py | 20 |
1 files changed, 11 insertions, 9 deletions
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'], |