use _find_views in pviews

1 files changed, 29 insertions, 10 deletions

diff --git a/pyramid/scripts/pviews.py b/pyramid/scripts/pviews.py
index 5e92ec4e6..15431e9b2 100644
--- a/pyramid/scripts/pviews.py
+++ b/pyramid/scripts/pviews.py
@@ -6,6 +6,7 @@ from pyramid.interfaces import IMultiView
 from pyramid.paster import bootstrap
 from pyramid.request import Request
 from pyramid.scripts.common import parse_vars
+from pyramid.view import _find_views
 
 def main(argv=sys.argv, quiet=False):
     command = PViewsCommand(argv, quiet)
@@ -90,11 +91,15 @@ class PViewsCommand(object):
                             IRouteRequest,
                             name=route.name,
                             default=IRequest)
-                        view = adapters.lookup(
-                            (IViewClassifier, request_iface, context_iface),
-                            IView, name='', default=None)
-                        if view is None:
+                        views = _find_views(
+                            request.registry,
+                            request_iface,
+                            context_iface,
+                            ''
+                            )
+                        if not views:
                             continue
+                        view = views[0]
                         view.__request_attrs__ = {}
                         view.__request_attrs__['matchdict'] = match
                         view.__request_attrs__['matched_route'] = route
@@ -149,17 +154,31 @@ class PViewsCommand(object):
         # find a view callable
         context_iface = providedBy(context)
         if routes_multiview is None:
-            view = adapters.lookup(
-                (IViewClassifier, request_iface, context_iface),
-                IView, name=view_name, default=None)
+            views = _find_views(
+                request.registry,
+                request_iface,
+                context_iface,
+                view_name,
+                )
+            if views:
+                view = views[0]
+            else:
+                view = None
         else:
             view = RoutesMultiView(infos, context_iface, root_factory, request)
 
         # routes are not registered with a view name
         if view is None:
-            view = adapters.lookup(
-                (IViewClassifier, request_iface, context_iface),
-                IView, name='', default=None)
+            views = _find_views(
+                request.registry,
+                request_iface,
+                context_iface,
+                '',
+                )
+            if views:
+                view = views[0]
+            else:
+                view = None
             # we don't want a multiview here
             if IMultiView.providedBy(view):
                 view = None