Minor readability changes.

2 files changed, 9 insertions, 16 deletions

diff --git a/repoze/bfg/router.py b/repoze/bfg/router.py
index f9ecd427d..17879b674 100644
--- a/repoze/bfg/router.py
+++ b/repoze/bfg/router.py
@@ -48,18 +48,16 @@ class Router(object):
     threadlocal_manager = manager
 
     def __init__(self, registry):
+        q = registry.queryUtility
+        self.logger = q(ILogger, 'repoze.bfg.debug')
+        self.notfound_view = q(INotFoundView, default=default_notfound_view)
+        self.forbidden_view = q(IForbiddenView, default=default_forbidden_view)
+        self.root_factory = q(IRootFactory, default=DefaultRootFactory)
+        self.root_policy = self.root_factory # b/w compat
         self.registry = registry
-        self.logger = registry.queryUtility(ILogger, 'repoze.bfg.debug')
-        self.notfound_view = registry.queryUtility(
-            INotFoundView, default=default_notfound_view)
-        self.forbidden_view = registry.queryUtility(
-            IForbiddenView, default=default_forbidden_view)
         settings = registry.queryUtility(ISettings)
         if settings is not None:
-            self.debug_notfound = settings.debug_notfound
-        self.root_factory = registry.queryUtility(IRootFactory,
-                                                  default=DefaultRootFactory)
-        self.root_policy = self.root_factory # b/w compat
+            self.debug_notfound = settings['debug_notfound']
         self.traverser_warned = {}
 
     def __call__(self, environ, start_response):
diff --git a/repoze/bfg/tests/test_router.py b/repoze/bfg/tests/test_router.py
index 9f82ab4d3..1333390c5 100644
--- a/repoze/bfg/tests/test_router.py
+++ b/repoze/bfg/tests/test_router.py
@@ -24,13 +24,8 @@ class RouterTests(unittest.TestCase):
 
     def _registerSettings(self, **kw):
         from repoze.bfg.interfaces import ISettings
-        class Settings:
-            def __init__(self, **kw):
-                self.__dict__.update(kw)
-
-        defaultkw = {'debug_authorization':False, 'debug_notfound':False}
-        defaultkw.update(kw)
-        settings = Settings(**defaultkw)
+        settings = {'debug_authorization':False, 'debug_notfound':False}
+        settings.update(kw)
         self.registry.registerUtility(settings, ISettings)
 
     def _registerTraverserFactory(self, context, view_name='', subpath=None,