diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-12-11 18:25:06 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-12-11 18:25:06 +0000 |
commit | d3c74446e1d0d59d6e4001ef26c8d227bf15ff98 (patch) | |
tree | 67adaf09562697e5d3159d727213d4651139eba8 | |
parent | 900a8db37882459b4afc53ff43447155694893e4 (diff) | |
parent | 885cdd96c630fa225a2e7417f541ddfeb335bd89 (diff) | |
download | django_openstack_auth-d3c74446e1d0d59d6e4001ef26c8d227bf15ff98.tar.gz |
Merge "Use set comprehension instead of converting lists to sets"
-rw-r--r-- | openstack_auth/backend.py | 8 | ||||
-rw-r--r-- | openstack_auth/user.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/openstack_auth/backend.py b/openstack_auth/backend.py index 3de30ff..865fc31 100644 --- a/openstack_auth/backend.py +++ b/openstack_auth/backend.py @@ -276,8 +276,8 @@ class KeystoneBackend(object): return set() # TODO(gabrielhurley): Integrate policy-driven RBAC # when supported by Keystone. - role_perms = set(["openstack.roles.%s" % role['name'].lower() - for role in user.roles]) + role_perms = {"openstack.roles.%s" % role['name'].lower() + for role in user.roles} services = [] for service in user.service_catalog: @@ -289,8 +289,8 @@ class KeystoneBackend(object): in service.get('endpoints', [])] if user.services_region in service_regions: services.append(service_type.lower()) - service_perms = set(["openstack.services.%s" % service - for service in services]) + service_perms = {"openstack.services.%s" % service + for service in services} return role_perms | service_perms def has_perm(self, user, perm, obj=None): diff --git a/openstack_auth/user.py b/openstack_auth/user.py index 0d79f44..d57bb86 100644 --- a/openstack_auth/user.py +++ b/openstack_auth/user.py @@ -293,12 +293,12 @@ class User(models.AbstractBaseUser, models.AnonymousUser): Returns ``True`` or ``False``. """ - admin_roles = [role.lower() for role in getattr( + admin_roles = {role.lower() for role in getattr( settings, 'OPENSTACK_KEYSTONE_ADMIN_ROLES', - ['admin'])] - user_roles = [role['name'].lower() for role in self.roles] - return True if set(admin_roles).intersection(user_roles) else False + ['admin'])} + user_roles = {role['name'].lower() for role in self.roles} + return not admin_roles.isdisjoint(user_roles) @property def authorized_tenants(self): |