remove deprecated media range support from add_view and add_route

3 files changed, 9 insertions, 77 deletions

diff --git a/tests/test_config/test_routes.py b/tests/test_config/test_routes.py
index d6f45608d..32a64b4bd 100644
--- a/tests/test_config/test_routes.py
+++ b/tests/test_config/test_routes.py
@@ -216,17 +216,12 @@ class RoutesConfiguratorMixinTests(unittest.TestCase):
         request.accept = DummyAccept('text/html')
         self.assertEqual(predicate(None, request), False)
 
-    def test_add_route_with_wildcard_accept(self):
+    def test_add_route_with_wildcard_accept_raises(self):
         config = self._makeOne(autocommit=True)
-        config.add_route('name', 'path', accept='text/*')
-        route = self._assertRoute(config, 'name', 'path', 1)
-        predicate = route.predicates[0]
-        request = self._makeRequest(config)
-        request.accept = DummyAccept('text/xml', contains=True)
-        self.assertEqual(predicate(None, request), True)
-        request = self._makeRequest(config)
-        request.accept = DummyAccept('application/json', contains=False)
-        self.assertEqual(predicate(None, request), False)
+        self.assertRaises(
+            ValueError,
+            lambda: config.add_route('name', 'path', accept='text/*'),
+        )
 
     def test_add_route_no_pattern_with_path(self):
         config = self._makeOne(autocommit=True)
@@ -313,6 +308,3 @@ class DummyAccept(object):
             if match in offers:
                 results.append((match, 1.0))
         return results
-
-    def __contains__(self, value):
-        return self.contains
diff --git a/tests/test_config/test_views.py b/tests/test_config/test_views.py
index 5e722c9a0..b72b9b36a 100644
--- a/tests/test_config/test_views.py
+++ b/tests/test_config/test_views.py
@@ -1815,25 +1815,12 @@ class TestViewsConfigurationMixin(unittest.TestCase):
         request.accept = DummyAccept('text/html')
         self._assertNotFound(wrapper, None, request)
 
-    def test_add_view_with_range_accept_match(self):
-        from pyramid.renderers import null_renderer
-
-        view = lambda *arg: 'OK'
-        config = self._makeOne(autocommit=True)
-        config.add_view(view=view, accept='text/*', renderer=null_renderer)
-        wrapper = self._getViewCallable(config)
-        request = self._makeRequest(config)
-        request.accept = DummyAccept('text/html', contains=True)
-        self.assertEqual(wrapper(None, request), 'OK')
-
-    def test_add_view_with_range_accept_nomatch(self):
+    def test_add_view_with_wildcard_accept_raises(self):
         view = lambda *arg: 'OK'
         config = self._makeOne(autocommit=True)
-        config.add_view(view=view, accept='text/*')
-        wrapper = self._getViewCallable(config)
-        request = self._makeRequest(config)
-        request.accept = DummyAccept('application/json', contains=False)
-        self._assertNotFound(wrapper, None, request)
+        self.assertRaises(
+            ValueError, lambda: config.add_view(view=view, accept='text/*')
+        )
 
     def test_add_view_with_containment_true(self):
         from pyramid.renderers import null_renderer
@@ -3142,11 +3129,6 @@ class TestMultiView(unittest.TestCase):
         self.assertEqual(mv.media_views['text/xml'], [(100, 'view5', None)])
         self.assertEqual(set(mv.accepts), set(['text/xml', 'text/html']))
         self.assertEqual(mv.views, [(99, 'view2', None), (100, 'view', None)])
-        mv.add('view6', 98, accept='text/*')
-        self.assertEqual(
-            mv.views,
-            [(98, 'view6', None), (99, 'view2', None), (100, 'view', None)],
-        )
 
     def test_add_with_phash(self):
         mv = self._makeOne()
@@ -4266,9 +4248,6 @@ class DummyAccept(object):
                 results.append((match, 1.0))
         return results
 
-    def __contains__(self, value):
-        return self.contains
-
 
 class DummyConfig:
     def __init__(self):
diff --git a/tests/test_integration.py b/tests/test_integration.py
index 28160eb7a..d57a7cf6e 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -869,45 +869,6 @@ class AcceptContentTypeTest(unittest.TestCase):
         )
         self.assertEqual(res.content_type, 'text/x-fallback')
 
-    def test_deprecated_ranges_in_route_predicate(self):
-        config = self._makeConfig()
-        config.add_route('foo', '/foo', accept='text/*')
-        config.add_view(lambda r: 'OK', route_name='foo', renderer='string')
-        app = self._makeTestApp(config)
-        res = app.get(
-            '/foo',
-            headers={'Accept': 'application/json; q=1.0, text/plain; q=0.9'},
-            status=200,
-        )
-        self.assertEqual(res.content_type, 'text/plain')
-        self.assertEqual(res.body, b'OK')
-        res = app.get(
-            '/foo', headers={'Accept': 'application/json'}, status=404
-        )
-        self.assertEqual(res.content_type, 'application/json')
-
-    def test_deprecated_ranges_in_view_predicate(self):
-        config = self._makeConfig()
-        config.add_route('foo', '/foo')
-        config.add_view(
-            lambda r: 'OK',
-            route_name='foo',
-            accept='text/*',
-            renderer='string',
-        )
-        app = self._makeTestApp(config)
-        res = app.get(
-            '/foo',
-            headers={'Accept': 'application/json; q=1.0, text/plain; q=0.9'},
-            status=200,
-        )
-        self.assertEqual(res.content_type, 'text/plain')
-        self.assertEqual(res.body, b'OK')
-        res = app.get(
-            '/foo', headers={'Accept': 'application/json'}, status=404
-        )
-        self.assertEqual(res.content_type, 'application/json')
-
 
 class DummyContext(object):
     pass