openstack
/
glance
Code Issues Proposed changes

Merge "Do not use Accept.best_match"

This commit is contained in:
Zuul 2018-10-17 19:30:09 +00:00 committed by Gerrit Code Review
parent 7a475d03be 64904ea9c9
commit 674059187d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glance/common/wsgi.py
View File

@ -1027,8 +1027,10 @@ class Request(webob.Request):
def best_match_content_type(self):
"""Determine the requested response content-type."""
supported = ('application/json',)
bm = self.accept.best_match(supported)
return bm or 'application/json'
best_matches = self.accept.acceptable_offers(supported)
if not best_matches:
return 'application/json'
return best_matches[0][0]
def get_content_type(self, allowed_content_types):
"""Determine content type of the request body."""