Merge pull request #498 from Cornices/remove-bestmatch

Remove usage of deprecated ``.best_match()``

CHANGES.txt

@@ -5,7 +5,9 @@ CHANGELOG
 3.5.0 (unreleased)
 ==================
 
-- Nothing changed yet.
+**Internal changes**
+
+- Remove usage of deprecated ``.best_match()`` (thanks @abk-code)
 
 
 3.4.2 (2018-10-24)

cornice/__init__.py

@@ -40,9 +40,9 @@ def set_localizer_for_languages(event, available_languages,
     """
     request = event.request
     if request.accept_language:
-        accepted = request.accept_language
-        locale = accepted.best_match(available_languages, default_locale_name)
-        request._LOCALE_ = locale
+        accepted = request.accept_language.lookup(available_languages,
+                                                  default=default_locale_name)
+        request._LOCALE_ = accepted
 
 
 def setup_localization(config):

cornice/pyramidhook.py

@@ -56,7 +56,7 @@ def _fallback_view(request):
                 acceptable = list(set(acceptable))
 
                 # Now check if that was actually the source of the problem.
-                if not request.accept.best_match(acceptable):
+                if not request.accept.acceptable_offers(offers=acceptable):
                     request.errors.add(
                         'header', 'Accept',
                         'Accept header should be one of {0}'.format(

cornice/util.py

@@ -65,9 +65,10 @@ def __call__(self, data, context):
         json_str = renderer(data, context)
 
         # XXX So we (re)set it ourselves here, i.e.: *after* the previous call.
-        content_type = (request.accept.best_match(self.acceptable) or
-                        self.acceptable[0])
-        response.content_type = content_type
+        ctypes = request.accept.acceptable_offers(offers=self.acceptable)
+        if not ctypes:
+            ctypes = [(self.acceptable[0], 1.0)]
+        response.content_type = ctypes[0][0]
         return json_str
 
 

tests/test_pyramidhook.py

@@ -223,7 +223,6 @@ def setUp(self):
 
     def test_no_sniff_is_added_to_responses(self):
         response = self.app.get('/wrapperservice')
-        print(response.headers)
         self.assertEqual(response.headers['X-Content-Type-Options'], 'nosniff')