summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-01-16 21:17:15 +0000
committerChris McDonough <chrism@agendaless.com>2009-01-16 21:17:15 +0000
commit1ccc194a225c579ba937fe1578f841db9aeb2720 (patch)
tree55b7f7f3dbc7d16985b8169c214c4542a8d7e97b
parentc3e350c10e4bd4f5e712cfb17cff0d308ded7010 (diff)
downloadpyramid-1ccc194a225c579ba937fe1578f841db9aeb2720.tar.gz
pyramid-1ccc194a225c579ba937fe1578f841db9aeb2720.tar.bz2
pyramid-1ccc194a225c579ba937fe1578f841db9aeb2720.zip
Do alsoProvides instead of directlyProvides in case the request factory
uses directlyProvides.
-rw-r--r--repoze/bfg/router.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/repoze/bfg/router.py b/repoze/bfg/router.py
index 4494fc506..817d5422a 100644
--- a/repoze/bfg/router.py
+++ b/repoze/bfg/router.py
@@ -6,7 +6,6 @@ from zope.component import getUtility
from zope.component import queryUtility
from zope.component.event import dispatch
-from zope.interface import directlyProvides
from zope.interface import alsoProvides
from zope.interface import implements
@@ -63,10 +62,10 @@ class Router(object):
request_factory = queryUtility(IRequestFactory, default=Request)
request = request_factory(environ)
- directlyProvides(request, IRequest)
- also = HTTP_METHOD_INTERFACES.get(request.method)
- if also is not None:
- alsoProvides(request, also)
+ alsoProvides(request, IRequest)
+ also_http = HTTP_METHOD_INTERFACES.get(request.method)
+ if also_http is not None:
+ alsoProvides(request, also_http)
dispatch(NewRequest(request))
root_factory = getUtility(IRootFactory)
@@ -143,11 +142,11 @@ def make_app(root_factory, package=None, filename='configure.zcml',
options = {}
registry = makeRegistry(filename, package)
- settings = Settings(options)
- registry.registerUtility(settings, ISettings)
+ registry.registerUtility(root_factory, IRootFactory)
debug_logger = make_stream_logger('repoze.bfg.debug', sys.stderr)
registry.registerUtility(debug_logger, ILogger, 'repoze.bfg.debug')
- registry.registerUtility(root_factory, IRootFactory)
+ settings = Settings(options)
+ registry.registerUtility(settings, ISettings)
app = Router(registry)
try: