Skip to content

Commit

Permalink
use registry
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.bluedynamics.eu/svn/module/bda.bfg.tile/trunk@1779 f119a143-da5b-4457-81e3-bee00661a780
  • Loading branch information
jensens committed Apr 15, 2010
1 parent 818a158 commit 4b072de
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions src/bda/bfg/tile/_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@
implements,
directlyProvides,
)
from zope.component import (
queryUtility,
getMultiAdapter,
ComponentLookupError,
)
from zope.component import ComponentLookupError
from repoze.bfg.interfaces import (
IRequest,
IResponseFactory,
Expand Down Expand Up @@ -74,7 +70,7 @@ def render_template_to_response(path, **kw):
result = renderer(kw, {})
if _redirect(kw):
return HTTPFound(location=kw['request'].environ['redirect'])
response_factory = queryUtility(IResponseFactory, default=Response)
response_factory = kw['request'].registry.queryUtility(IResponseFactory, default=Response)
return response_factory(result)

def render_tile(model, request, name):
Expand All @@ -89,9 +85,8 @@ def render_tile(model, request, name):
``name``
name of the requested tile
"""
registry = get_current_registry()
try:
tile = registry.getMultiAdapter((model, request), ITile, name=name)
tile = request.registry.getMultiAdapter((model, request), ITile, name=name)
except ComponentLookupError, e:
return u"Tile with name '%s' not found:<br /><pre>%s</pre>" % \
(name, cgi.escape(str(e)))
Expand Down Expand Up @@ -222,7 +217,6 @@ def registerTile(name, path=None, attribute='render',
strict)
registry.registerAdapter(tile, [interface, IRequest], ITile, name,
event=False)
print "register tile %s %s" % (name, registry)

class tile(object):
"""Decorator to register classes and functions as tiles.
Expand Down

0 comments on commit 4b072de

Please sign in to comment.