Remove accept_header from context
This is only used in the one place in version controllers and we can simply use the request object directly instead. Change-Id: Iecd10f185eb3a4afd4a59a1f9a9bd346d2301058
This commit is contained in:
parent
c5e0cd4510
commit
a624c9f83c
@ -56,7 +56,6 @@ class Request(webob.Request):
|
||||
# values by the container and processed by the pipeline. The complete
|
||||
# set is not yet known.
|
||||
context['environment'] = self.environ
|
||||
context['accept_header'] = self.accept
|
||||
|
||||
context.setdefault('is_admin', False)
|
||||
return context
|
||||
|
@ -87,10 +87,10 @@ class MimeTypes(object):
|
||||
JSON_HOME = 'application/json-home'
|
||||
|
||||
|
||||
def v3_mime_type_best_match(context):
|
||||
def v3_mime_type_best_match(request):
|
||||
|
||||
# accept_header is a WebOb MIMEAccept object so supports best_match.
|
||||
accept_header = context['accept_header']
|
||||
accept_header = request.accept
|
||||
|
||||
if not accept_header:
|
||||
return MimeTypes.JSON
|
||||
@ -161,7 +161,7 @@ class Version(wsgi.Application):
|
||||
|
||||
def get_versions(self, request):
|
||||
|
||||
req_mime_type = v3_mime_type_best_match(request.context_dict)
|
||||
req_mime_type = v3_mime_type_best_match(request)
|
||||
if req_mime_type == MimeTypes.JSON_HOME:
|
||||
v3_json_home = request_v3_json_home('/v3')
|
||||
return wsgi.render_response(
|
||||
@ -198,7 +198,7 @@ class Version(wsgi.Application):
|
||||
def get_version_v3(self, request):
|
||||
versions = self._get_versions_list(request.context_dict)
|
||||
if 'v3' in _VERSIONS:
|
||||
req_mime_type = v3_mime_type_best_match(request.context_dict)
|
||||
req_mime_type = v3_mime_type_best_match(request)
|
||||
|
||||
if req_mime_type == MimeTypes.JSON_HOME:
|
||||
return wsgi.render_response(
|
||||
|
Loading…
Reference in New Issue
Block a user