From 567709808add935811925f94e3804e08f66888a4 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Tue, 22 Sep 2009 03:49:24 +0000
Subject: Use dictionary instead of DummySettings.

---
 repoze/bfg/tests/test_security.py | 6 +-----
 repoze/bfg/tests/test_view.py     | 7 +------
 repoze/bfg/view.py                | 4 +++-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/repoze/bfg/tests/test_security.py b/repoze/bfg/tests/test_security.py
index e06386fdb..ef08e8641 100644
--- a/repoze/bfg/tests/test_security.py
+++ b/repoze/bfg/tests/test_security.py
@@ -134,7 +134,7 @@ class TestViewExecutionPermitted(unittest.TestCase):
         import zope.component
         gsm = zope.component.getGlobalSiteManager()
         from repoze.bfg.interfaces import ISettings
-        settings = DummySettings(debug_authorization=True)
+        settings = dict(debug_authorization=True)
         gsm.registerUtility(settings, ISettings)
         context = DummyContext()
         request = DummyRequest({})
@@ -346,7 +346,3 @@ class DummyAuthorizationPolicy:
     def principals_allowed_by_permission(self, context, permission):
         return self.result
 
-class DummySettings:
-    def __init__(self, **kw):
-        self.__dict__.update(kw)
-
diff --git a/repoze/bfg/tests/test_view.py b/repoze/bfg/tests/test_view.py
index e741c32f5..edbfa120f 100644
--- a/repoze/bfg/tests/test_view.py
+++ b/repoze/bfg/tests/test_view.py
@@ -1233,10 +1233,9 @@ class TestDeriveView(unittest.TestCase):
         sm.registerUtility(logger, ILogger, 'repoze.bfg.debug')
         return logger
 
-    def _registerSettings(self, **d):
+    def _registerSettings(self, **settings):
         from repoze.bfg.interfaces import ISettings
         from zope.component import getSiteManager
-        settings = DummySettings(d)
         sm = getSiteManager()
         sm.registerUtility(settings, ISettings)
 
@@ -1575,10 +1574,6 @@ class DummyLogger:
     warn = info
     debug = info
 
-class DummySettings(dict):
-    def __getattr__(self, name):
-        return self[name]
-    
 class DummySecurityPolicy:
     def __init__(self, permitted=True):
         self.permitted = permitted
diff --git a/repoze/bfg/view.py b/repoze/bfg/view.py
index 82ddd74fa..8d8d6baa0 100644
--- a/repoze/bfg/view.py
+++ b/repoze/bfg/view.py
@@ -680,7 +680,9 @@ def authdebug_view(view, permission):
     authn_policy = queryUtility(IAuthenticationPolicy)
     authz_policy = queryUtility(IAuthorizationPolicy)
     settings = get_settings()
-    debug_authorization = getattr(settings, 'debug_authorization', False)
+    debug_authorization = False
+    if settings is not None:
+        debug_authorization = settings.get('debug_authorization', False)
     if debug_authorization:
         def _authdebug_view(context, request):
             view_name = getattr(request, 'view_name', None)
-- 
cgit v1.2.3