From f5c25ef97393f7b4bf1353b11eeb841c53e2feaf Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 18 Jun 2009 21:49:33 +0000 Subject: - Allow views to be *optionally* defined as callables that accept only a request object, instead of both a context and a request (which still works, and always will). The following types work as views in this style: - functions that accept a single argument ``request``, e.g.:: def aview(request): pass - new and old-style classes that have an ``__init__`` method that accepts ``self, request``, e.g.:: def View(object): __init__(self, request): pass - Arbitrary callables that have a ``__call__`` method that accepts ``self, request``, e.g.:: def AView(object): def __call__(self, request): pass view = AView() This likely should have been the calling convention all along, as the request has ``context`` as an attribute already, and with views called as a result of URL dispatch, having the context in the arguments is not very useful. C'est la vie. --- repoze/bfg/router.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'repoze/bfg/router.py') diff --git a/repoze/bfg/router.py b/repoze/bfg/router.py index a5bea3f69..d85f599b2 100644 --- a/repoze/bfg/router.py +++ b/repoze/bfg/router.py @@ -2,6 +2,7 @@ from cgi import escape import sys from webob import Response +from zope.interface import providedBy from zope.component.event import dispatch from zope.component import queryUtility @@ -205,16 +206,15 @@ class Router(object): msg = str(permitted) else: msg = 'Unauthorized: failed security policy check' - environ['repoze.bfg.message'] = msg - return respond(self.forbidden_view(context, request), '') - response = registry.queryMultiAdapter( - (context, request), IView, name=view_name) + view_callable = registry.adapters.lookup( + map(providedBy, (context, request)), IView, name=view_name, + default=None) - if response is None: + if view_callable is None: if self.debug_notfound: msg = ( 'debug_notfound of url %s; path_info: %r, context: %r, ' @@ -230,6 +230,7 @@ class Router(object): return respond(self.notfound_view(context, request), '') + response = view_callable(context, request) return respond(response, view_name) finally: -- cgit v1.2.3