openstack
/
keystone
Code Issues Proposed changes

Merge "Remove the no use arg (auth=None)"

This commit is contained in:
Jenkins 2016-09-30 16:54:58 +00:00 committed by Gerrit Code Review
parent 635d4a4c31 ec7cec0eda
commit 106bc4559b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keystone/auth/controllers.py
View File

@ -564,7 +564,7 @@ class Auth(controller.V3Controller):
return render_token_data_response(token_id, token_data)
@controller.protected()
def revocation_list(self, request, auth=None):
def revocation_list(self, request):
if not CONF.token.revoke_by_id:
raise exception.Gone()

6
keystone/token/controllers.py
View File

@ -48,13 +48,13 @@ class ExternalAuthNotApplicable(Exception):
class Auth(controller.V2Controller):
@controller.v2_deprecated
def ca_cert(self, request, auth=None):
def ca_cert(self, request):
with open(CONF.signing.ca_certs, 'r') as ca_file:
data = ca_file.read()
return data
@controller.v2_deprecated
def signing_cert(self, request, auth=None):
def signing_cert(self, request):
with open(CONF.signing.certfile, 'r') as cert_file:
data = cert_file.read()
return data
@ -455,7 +455,7 @@ class Auth(controller.V2Controller):
@controller.v2_deprecated
@controller.protected()
def revocation_list(self, request, auth=None):
def revocation_list(self, request):
if not CONF.token.revoke_by_id:
raise exception.Gone()
tokens = self.token_provider_api.list_revoked_tokens()