diff options
author | Dolph Mathews <dolph.mathews@gmail.com> | 2013-06-27 10:35:39 -0500 |
---|---|---|
committer | Adam Young <ayoung@redhat.com> | 2013-06-28 00:12:20 -0400 |
commit | 911c3156563c4e33bff3b4652b30c744f8b12de6 (patch) | |
tree | b51b11612bb735a51fe537b68430f3fd961ba850 /keystone/common/wsgi.py | |
parent | 6c6d15ca8cc7376e0fff2d442b2cda8eebb324cf (diff) | |
download | keystone-911c3156563c4e33bff3b4652b30c744f8b12de6.tar.gz keystone-911c3156563c4e33bff3b4652b30c744f8b12de6.tar.xz keystone-911c3156563c4e33bff3b4652b30c744f8b12de6.zip |
Stop passing context to managers (bug 1194938)
We don't have a use case for passing the request context to the manager
layer, so this patch removes a bunch of cruft.
Change-Id: Ic6435782c4c9f32e38c7800172645cc1af23ea09
Diffstat (limited to 'keystone/common/wsgi.py')
-rw-r--r-- | keystone/common/wsgi.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py index 8f76b24f..5143db6e 100644 --- a/keystone/common/wsgi.py +++ b/keystone/common/wsgi.py @@ -227,7 +227,7 @@ class Application(BaseApplication): if not context['is_admin']: try: user_token_ref = self.token_api.get_token( - context=context, token_id=context['token_id']) + token_id=context['token_id']) except exception.TokenNotFound as e: raise exception.Unauthorized(e) @@ -246,10 +246,10 @@ class Application(BaseApplication): raise exception.Unauthorized() # NOTE(vish): this is pretty inefficient - creds['roles'] = [self.identity_api.get_role(context, role)['name'] + creds['roles'] = [self.identity_api.get_role(role)['name'] for role in creds.get('roles', [])] # Accept either is_admin or the admin role - self.policy_api.enforce(context, creds, 'admin_required', {}) + self.policy_api.enforce(creds, 'admin_required', {}) class Middleware(Application): |