Consider superclass views after predicate mismatch

CONTRIBUTORS.txt

@@ -198,3 +198,5 @@ Contributors
 - Georges Dubus, 2013/03/21
 
 - Jason McKellar, 2013/03/28
+
+- Laurence Rowe, 2013/04/24

pyramid/router.py

@@ -165,7 +165,7 @@ def handle_request(self, request):
             except PredicateMismatch:
                 # look for other views that meet the predicate
                 # criteria
-                for iface in context_iface.flattened():
+                for iface in context_iface.__sro__[1:]:
                     view_callable = adapters.lookup(
                         (IViewClassifier, request.request_iface, iface),
                         IView, name=view_name, default=None)

pyramid/tests/test_router.py

@@ -1180,11 +1180,9 @@ def test_call_view_predicate_mismatch_doesnt_hide_views(self):
         from pyramid.interfaces import IViewClassifier
         from pyramid.interfaces import IRequest, IResponse
         from pyramid.response import Response
-        from zope.interface import Interface, implementer
-        class IContext(Interface):
+        class BaseContext:
             pass
-        @implementer(IContext)
-        class DummyContext:
+        class DummyContext(BaseContext):
             pass
         context = DummyContext()
         self._registerTraverserFactory(context)
@@ -1193,7 +1191,7 @@ class DummyContext:
                            DummyContext)
         good_view = DummyView('abc')
         self._registerView(self.config.derive_view(good_view),
-                            '', IViewClassifier, IRequest, IContext)
+                            '', IViewClassifier, IRequest, BaseContext)
         router = self._makeOne()
         def make_response(s):
             return Response(s)