diff options
| -rw-r--r-- | keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py | 2 | ||||
| -rw-r--r-- | keystone/token/controllers.py | 2 | ||||
| -rw-r--r-- | keystone/trust/controllers.py | 2 | ||||
| -rw-r--r-- | tox.ini | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py b/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py index b68b261d..ca744122 100644 --- a/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py +++ b/keystone/common/sql/migrate_repo/versions/020_migrate_metadata_table_roles.py @@ -25,7 +25,7 @@ def upgrade(migrate_engine): session = sql.orm.sessionmaker(bind=migrate_engine)() for metadata in session.query(old_metadata_table): - if not config.CONF.member_role_id in metadata.data: + if config.CONF.member_role_id not in metadata.data: data = json.loads(metadata.data) data['roles'].append(config.CONF.member_role_id) else: diff --git a/keystone/token/controllers.py b/keystone/token/controllers.py index 1e2eb7d6..e9296216 100644 --- a/keystone/token/controllers.py +++ b/keystone/token/controllers.py @@ -227,7 +227,7 @@ class Auth(controller.V2Controller): trust_id = auth['trust_id'] trust_roles = [] for role in trust_ref['roles']: - if not 'roles' in metadata_ref: + if 'roles' not in metadata_ref: raise exception.Forbidden()() if role['id'] in metadata_ref['roles']: trust_roles.append(role['id']) diff --git a/keystone/trust/controllers.py b/keystone/trust/controllers.py index 01ebc176..1d7dce6c 100644 --- a/keystone/trust/controllers.py +++ b/keystone/trust/controllers.py @@ -64,7 +64,7 @@ class TrustV3(controller.V3Controller): (trust['expires_at'], subsecond=True)) - if not 'roles' in trust: + if 'roles' not in trust: trust['roles'] = [] trust_full_roles = [] for trust_role in trust['roles']: @@ -43,8 +43,7 @@ show-source = true # H701: empty localization string # H702: use bare string concatenation instead of +; formatting operation should be outside of localization method call # H703: multiple positional placeholders -# H902: use the 'not in' operator for collection membership evaluation -ignore = H201,H301,H302,H304,H306,H401,H402,H403,H404,H701,H702,H703,H902 +ignore = H201,H301,H302,H304,H306,H401,H402,H403,H404,H701,H702,H703 builtins = _ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools,vendor |