summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-04-06 05:15:57 -0400
committerChris McDonough <chrism@plope.com>2015-04-06 05:15:57 -0400
commite028e0a6fbb0050a007236721277b2fa62a00e5c (patch)
treef0449f9e3b9f8181c5890c62f1c15c3f4a64d3c0
parentc8f1ea7e7185e7ea22abcd5abb9a23738165d140 (diff)
downloadpyramid-e028e0a6fbb0050a007236721277b2fa62a00e5c.tar.gz
pyramid-e028e0a6fbb0050a007236721277b2fa62a00e5c.tar.bz2
pyramid-e028e0a6fbb0050a007236721277b2fa62a00e5c.zip
use _find_views instead of lookup in proutes
-rw-r--r--pyramid/scripts/proutes.py21
1 files changed, 9 insertions, 12 deletions
diff --git a/pyramid/scripts/proutes.py b/pyramid/scripts/proutes.py
index 544947724..a389c303c 100644
--- a/pyramid/scripts/proutes.py
+++ b/pyramid/scripts/proutes.py
@@ -4,18 +4,16 @@ import sys
import textwrap
import re
+from zope.interface import Interface
+
from pyramid.paster import bootstrap
from pyramid.compat import (string_types, configparser)
-from pyramid.interfaces import (
- IRouteRequest,
- IViewClassifier,
- IView,
-)
+from pyramid.interfaces import IRouteRequest
from pyramid.config import not_
from pyramid.scripts.common import parse_vars
from pyramid.static import static_view
-from zope.interface import Interface
+from pyramid.view import _find_views
PAD = 3
@@ -159,12 +157,11 @@ def get_route_data(route, registry):
(route.name, _get_pattern(route), UNKNOWN_KEY, ANY_KEY)
]
- view_callable = registry.adapters.lookup(
- (IViewClassifier, request_iface, Interface),
- IView,
- name='',
- default=None
- )
+ view_callables = _find_views(registry, request_iface, Interface, '')
+ if view_callables:
+ view_callable = view_callables[0]
+ else:
+ view_callable = None
view_module = _get_view_module(view_callable)
# Introspectables can be turned off, so there could be a chance