- Move the ``Settings`` class from ``pyramid.settings`` to

  ``pyramid.config.settings``.

6 files changed, 588 insertions, 582 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index 0a015aa0a..f623ccbc3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -131,6 +131,9 @@ Internal
 - Moved the ``StaticURLInfo`` class from ``pyramid.static`` to
   ``pyramid.config.views``.
 
+- Move the ``Settings`` class from ``pyramid.settings`` to
+  ``pyramid.config.settings``.
+
 Deprecations
 ------------
 
diff --git a/TODO.txt b/TODO.txt
index 744e97778..dc2d07c5b 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -6,8 +6,7 @@ Nice-to-Have
 
 - Flesh out "paste" chapter.
 
-- Move configuration-related stuff in "static" to config/views, from
-  "settings" to config/settings, "renderers" to config/rendering, "asset" to
+- Move config-related stuff from "renderers" to config/rendering, "asset" to
   config/assets, and possibly mako/chameleon rendering stuff to
   config/rendering.
 
diff --git a/pyramid/config/settings.py b/pyramid/config/settings.py
index fad442853..f3ff541fa 100644
--- a/pyramid/config/settings.py
+++ b/pyramid/config/settings.py
@@ -1,4 +1,11 @@
-from pyramid.settings import Settings
+import os
+
+from zope.deprecation import deprecate
+from zope.interface import implements
+
+from pyramid.interfaces import ISettings
+
+from pyramid.settings import asbool
 
 class SettingsConfiguratorMixin(object):
     def _set_settings(self, mapping):
@@ -46,3 +53,105 @@ class SettingsConfiguratorMixin(object):
            """
         return self.registry.settings
 
+
+class Settings(dict):
+    """ Deployment settings.  Update application settings (usually
+    from PasteDeploy keywords) with framework-specific key/value pairs
+    (e.g. find ``PYRAMID_DEBUG_AUTHORIZATION`` in os.environ and jam into
+    keyword args)."""
+    implements(ISettings)
+    # _environ_ is dep inj for testing
+    def __init__(self, d=None, _environ_=os.environ, **kw):
+        if d is None:
+            d = {}
+        dict.__init__(self, d, **kw)
+        eget = _environ_.get
+        config_debug_all = self.get('debug_all', '')
+        config_debug_all = self.get('pyramid.debug_all', config_debug_all)
+        eff_debug_all = asbool(eget('PYRAMID_DEBUG_ALL', config_debug_all))
+        config_reload_all = self.get('reload_all', '')
+        config_reload_all = self.get('pyramid.reload_all', config_reload_all)
+        eff_reload_all = asbool(eget('PYRAMID_RELOAD_ALL', config_reload_all))
+        config_debug_auth = self.get('debug_authorization', '')
+        config_debug_auth = self.get('pyramid.debug_authorization',
+                                     config_debug_auth)
+        eff_debug_auth = asbool(eget('PYRAMID_DEBUG_AUTHORIZATION',
+                                     config_debug_auth))
+        config_debug_notfound = self.get('debug_notfound', '')
+        config_debug_notfound = self.get('pyramid.debug_notfound',
+                                         config_debug_notfound)
+        eff_debug_notfound = asbool(eget('PYRAMID_DEBUG_NOTFOUND',
+                                         config_debug_notfound))
+        config_debug_routematch = self.get('debug_routematch', '')
+        config_debug_routematch = self.get('pyramid.debug_routematch',
+                                           config_debug_routematch)
+        eff_debug_routematch = asbool(eget('PYRAMID_DEBUG_ROUTEMATCH',
+                                         config_debug_routematch))
+        config_debug_templates = self.get('debug_templates', '')
+        config_debug_templates = self.get('pyramid.debug_templates',
+                                          config_debug_templates)
+        eff_debug_templates = asbool(eget('PYRAMID_DEBUG_TEMPLATES',
+                                          config_debug_templates))
+        config_reload_templates = self.get('reload_templates', '')
+        config_reload_templates = self.get('pyramid.reload_templates',
+                                           config_reload_templates)
+        eff_reload_templates = asbool(eget('PYRAMID_RELOAD_TEMPLATES',
+                                           config_reload_templates))
+        config_reload_assets = self.get('reload_assets', '')
+        config_reload_assets = self.get('pyramid.reload_assets',
+                                        config_reload_assets)
+        reload_assets = asbool(eget('PYRAMID_RELOAD_ASSETS',
+                                    config_reload_assets))
+        config_reload_resources = self.get('reload_resources', '')
+        config_reload_resources = self.get('pyramid.reload_resources',
+                                           config_reload_resources)
+        reload_resources = asbool(eget('PYRAMID_RELOAD_RESOURCES',
+                                    config_reload_resources))
+        # reload_resources is an older alias for reload_assets
+        eff_reload_assets = reload_assets or reload_resources
+        locale_name = self.get('default_locale_name', 'en')
+        locale_name = self.get('pyramid.default_locale_name', locale_name)
+        eff_locale_name = eget('PYRAMID_DEFAULT_LOCALE_NAME', locale_name)
+        config_prevent_http_cache = self.get('prevent_http_cache', '')
+        config_prevent_http_cache = self.get('pyramid.prevent_http_cache',
+                                             config_prevent_http_cache)
+        eff_prevent_http_cache = asbool(eget('PYRAMID_PREVENT_HTTP_CACHE',
+                                             config_prevent_http_cache))
+
+        update = {
+            'debug_authorization': eff_debug_all or eff_debug_auth,
+            'debug_notfound': eff_debug_all or eff_debug_notfound,
+            'debug_routematch': eff_debug_all or eff_debug_routematch,
+            'debug_templates': eff_debug_all or eff_debug_templates,
+            'reload_templates': eff_reload_all or eff_reload_templates,
+            'reload_resources':eff_reload_all or eff_reload_assets,
+            'reload_assets':eff_reload_all or eff_reload_assets,
+            'default_locale_name':eff_locale_name,
+            'prevent_http_cache':eff_prevent_http_cache,
+
+            'pyramid.debug_authorization': eff_debug_all or eff_debug_auth,
+            'pyramid.debug_notfound': eff_debug_all or eff_debug_notfound,
+            'pyramid.debug_routematch': eff_debug_all or eff_debug_routematch,
+            'pyramid.debug_templates': eff_debug_all or eff_debug_templates,
+            'pyramid.reload_templates': eff_reload_all or eff_reload_templates,
+            'pyramid.reload_resources':eff_reload_all or eff_reload_assets,
+            'pyramid.reload_assets':eff_reload_all or eff_reload_assets,
+            'pyramid.default_locale_name':eff_locale_name,
+            'pyramid.prevent_http_cache':eff_prevent_http_cache,
+            }
+
+        self.update(update)
+
+    dictlike = ('Use of the request as a dict-like object is deprecated as '
+                'of Pyramid 1.1.  Use dict-like methods of "request.environ" '
+                'instead.')
+
+    @deprecate('Obtaining settings via attributes of the settings dictionary '
+               'is deprecated as of Pyramid 1.2; use settings["foo"] instead '
+               'of settings.foo')
+    def __getattr__(self, name):
+        try:
+            return self[name]
+        except KeyError:
+            raise AttributeError(name)
+
diff --git a/pyramid/settings.py b/pyramid/settings.py
index c77a1797f..3c376c4a9 100644
--- a/pyramid/settings.py
+++ b/pyramid/settings.py
@@ -1,114 +1,7 @@
-import os
-
 from zope.deprecation import deprecated
-from zope.deprecation import deprecate
-from zope.interface import implements
-
-from pyramid.interfaces import ISettings
 
 from pyramid.threadlocal import get_current_registry
 
-class Settings(dict):
-    """ Deployment settings.  Update application settings (usually
-    from PasteDeploy keywords) with framework-specific key/value pairs
-    (e.g. find ``PYRAMID_DEBUG_AUTHORIZATION`` in os.environ and jam into
-    keyword args)."""
-    implements(ISettings)
-    # _environ_ is dep inj for testing
-    def __init__(self, d=None, _environ_=os.environ, **kw):
-        if d is None:
-            d = {}
-        dict.__init__(self, d, **kw)
-        eget = _environ_.get
-        config_debug_all = self.get('debug_all', '')
-        config_debug_all = self.get('pyramid.debug_all', config_debug_all)
-        eff_debug_all = asbool(eget('PYRAMID_DEBUG_ALL', config_debug_all))
-        config_reload_all = self.get('reload_all', '')
-        config_reload_all = self.get('pyramid.reload_all', config_reload_all)
-        eff_reload_all = asbool(eget('PYRAMID_RELOAD_ALL', config_reload_all))
-        config_debug_auth = self.get('debug_authorization', '')
-        config_debug_auth = self.get('pyramid.debug_authorization',
-                                     config_debug_auth)
-        eff_debug_auth = asbool(eget('PYRAMID_DEBUG_AUTHORIZATION',
-                                     config_debug_auth))
-        config_debug_notfound = self.get('debug_notfound', '')
-        config_debug_notfound = self.get('pyramid.debug_notfound',
-                                         config_debug_notfound)
-        eff_debug_notfound = asbool(eget('PYRAMID_DEBUG_NOTFOUND',
-                                         config_debug_notfound))
-        config_debug_routematch = self.get('debug_routematch', '')
-        config_debug_routematch = self.get('pyramid.debug_routematch',
-                                           config_debug_routematch)
-        eff_debug_routematch = asbool(eget('PYRAMID_DEBUG_ROUTEMATCH',
-                                         config_debug_routematch))
-        config_debug_templates = self.get('debug_templates', '')
-        config_debug_templates = self.get('pyramid.debug_templates',
-                                          config_debug_templates)
-        eff_debug_templates = asbool(eget('PYRAMID_DEBUG_TEMPLATES',
-                                          config_debug_templates))
-        config_reload_templates = self.get('reload_templates', '')
-        config_reload_templates = self.get('pyramid.reload_templates',
-                                           config_reload_templates)
-        eff_reload_templates = asbool(eget('PYRAMID_RELOAD_TEMPLATES',
-                                           config_reload_templates))
-        config_reload_assets = self.get('reload_assets', '')
-        config_reload_assets = self.get('pyramid.reload_assets',
-                                        config_reload_assets)
-        reload_assets = asbool(eget('PYRAMID_RELOAD_ASSETS',
-                                    config_reload_assets))
-        config_reload_resources = self.get('reload_resources', '')
-        config_reload_resources = self.get('pyramid.reload_resources',
-                                           config_reload_resources)
-        reload_resources = asbool(eget('PYRAMID_RELOAD_RESOURCES',
-                                    config_reload_resources))
-        # reload_resources is an older alias for reload_assets
-        eff_reload_assets = reload_assets or reload_resources
-        locale_name = self.get('default_locale_name', 'en')
-        locale_name = self.get('pyramid.default_locale_name', locale_name)
-        eff_locale_name = eget('PYRAMID_DEFAULT_LOCALE_NAME', locale_name)
-        config_prevent_http_cache = self.get('prevent_http_cache', '')
-        config_prevent_http_cache = self.get('pyramid.prevent_http_cache',
-                                             config_prevent_http_cache)
-        eff_prevent_http_cache = asbool(eget('PYRAMID_PREVENT_HTTP_CACHE',
-                                             config_prevent_http_cache))
-
-        update = {
-            'debug_authorization': eff_debug_all or eff_debug_auth,
-            'debug_notfound': eff_debug_all or eff_debug_notfound,
-            'debug_routematch': eff_debug_all or eff_debug_routematch,
-            'debug_templates': eff_debug_all or eff_debug_templates,
-            'reload_templates': eff_reload_all or eff_reload_templates,
-            'reload_resources':eff_reload_all or eff_reload_assets,
-            'reload_assets':eff_reload_all or eff_reload_assets,
-            'default_locale_name':eff_locale_name,
-            'prevent_http_cache':eff_prevent_http_cache,
-
-            'pyramid.debug_authorization': eff_debug_all or eff_debug_auth,
-            'pyramid.debug_notfound': eff_debug_all or eff_debug_notfound,
-            'pyramid.debug_routematch': eff_debug_all or eff_debug_routematch,
-            'pyramid.debug_templates': eff_debug_all or eff_debug_templates,
-            'pyramid.reload_templates': eff_reload_all or eff_reload_templates,
-            'pyramid.reload_resources':eff_reload_all or eff_reload_assets,
-            'pyramid.reload_assets':eff_reload_all or eff_reload_assets,
-            'pyramid.default_locale_name':eff_locale_name,
-            'pyramid.prevent_http_cache':eff_prevent_http_cache,
-            }
-
-        self.update(update)
-
-    dictlike = ('Use of the request as a dict-like object is deprecated as '
-                'of Pyramid 1.1.  Use dict-like methods of "request.environ" '
-                'instead.')
-
-    @deprecate('Obtaining settings via attributes of the settings dictionary '
-               'is deprecated as of Pyramid 1.2; use settings["foo"] instead '
-               'of settings.foo')
-    def __getattr__(self, name):
-        try:
-            return self[name]
-        except KeyError:
-            raise AttributeError(name)
-
 def get_settings():
     """
     Return a :term:`deployment settings` object for the current application.
diff --git a/pyramid/tests/test_config/test_settings.py b/pyramid/tests/test_config/test_settings.py
new file mode 100644
index 000000000..3ecdb4853
--- /dev/null
+++ b/pyramid/tests/test_config/test_settings.py
@@ -0,0 +1,474 @@
+import unittest
+
+class TestSettings(unittest.TestCase):
+    def setUp(self):
+        from zope.deprecation import __show__
+        __show__.off()
+
+    def tearDown(self):
+        from zope.deprecation import __show__
+        __show__.on()
+        
+    def _getTargetClass(self):
+        from pyramid.config.settings import Settings
+        return Settings
+
+    def _makeOne(self, d=None, environ=None):
+        if environ is None:
+            environ = {}
+        klass = self._getTargetClass()
+        return klass(d, _environ_=environ)
+
+    def test_getattr(self):
+        settings = self._makeOne({'reload_templates':False})
+        self.assertEqual(settings.reload_templates, False)
+
+    def test_getattr_raises_attribute_error(self):
+        settings = self._makeOne()
+        self.assertRaises(AttributeError, settings.__getattr__, 'mykey')
+
+    def test_noargs(self):
+        settings = self._makeOne()
+        self.assertEqual(settings['debug_authorization'], False)
+        self.assertEqual(settings['debug_notfound'], False)
+        self.assertEqual(settings['debug_routematch'], False)
+        self.assertEqual(settings['reload_templates'], False)
+        self.assertEqual(settings['reload_resources'], False)
+
+        self.assertEqual(settings['pyramid.debug_authorization'], False)
+        self.assertEqual(settings['pyramid.debug_notfound'], False)
+        self.assertEqual(settings['pyramid.debug_routematch'], False)
+        self.assertEqual(settings['pyramid.reload_templates'], False)
+        self.assertEqual(settings['pyramid.reload_resources'], False)
+
+    def test_prevent_http_cache(self):
+        settings = self._makeOne({})
+        self.assertEqual(settings['prevent_http_cache'], False)
+        self.assertEqual(settings['pyramid.prevent_http_cache'], False)
+        result = self._makeOne({'prevent_http_cache':'false'})
+        self.assertEqual(result['prevent_http_cache'], False)
+        self.assertEqual(result['pyramid.prevent_http_cache'], False)
+        result = self._makeOne({'prevent_http_cache':'t'})
+        self.assertEqual(result['prevent_http_cache'], True)
+        self.assertEqual(result['pyramid.prevent_http_cache'], True)
+        result = self._makeOne({'prevent_http_cache':'1'})
+        self.assertEqual(result['prevent_http_cache'], True)
+        self.assertEqual(result['pyramid.prevent_http_cache'], True)
+        result = self._makeOne({'pyramid.prevent_http_cache':'t'})
+        self.assertEqual(result['prevent_http_cache'], True)
+        self.assertEqual(result['pyramid.prevent_http_cache'], True)
+        result = self._makeOne({}, {'PYRAMID_PREVENT_HTTP_CACHE':'1'})
+        self.assertEqual(result['prevent_http_cache'], True)
+        self.assertEqual(result['pyramid.prevent_http_cache'], True)
+        result = self._makeOne({'prevent_http_cache':'false',
+                                'pyramid.prevent_http_cache':'1'})
+        self.assertEqual(result['prevent_http_cache'], True)
+        self.assertEqual(result['pyramid.prevent_http_cache'], True)
+        result = self._makeOne({'prevent_http_cache':'false',
+                                'pyramid.prevent_http_cache':'f'},
+                               {'PYRAMID_PREVENT_HTTP_CACHE':'1'})
+        self.assertEqual(result['prevent_http_cache'], True)
+        self.assertEqual(result['pyramid.prevent_http_cache'], True)
+
+    def test_reload_templates(self):
+        settings = self._makeOne({})
+        self.assertEqual(settings['reload_templates'], False)
+        self.assertEqual(settings['pyramid.reload_templates'], False)
+        result = self._makeOne({'reload_templates':'false'})
+        self.assertEqual(result['reload_templates'], False)
+        self.assertEqual(result['pyramid.reload_templates'], False)
+        result = self._makeOne({'reload_templates':'t'})
+        self.assertEqual(result['reload_templates'], True)
+        self.assertEqual(result['pyramid.reload_templates'], True)
+        result = self._makeOne({'reload_templates':'1'})
+        self.assertEqual(result['reload_templates'], True)
+        self.assertEqual(result['pyramid.reload_templates'], True)
+        result = self._makeOne({'pyramid.reload_templates':'1'})
+        self.assertEqual(result['reload_templates'], True)
+        self.assertEqual(result['pyramid.reload_templates'], True)
+        result = self._makeOne({}, {'PYRAMID_RELOAD_TEMPLATES':'1'})
+        self.assertEqual(result['reload_templates'], True)
+        self.assertEqual(result['pyramid.reload_templates'], True)
+        result = self._makeOne({'reload_templates':'false',
+                                'pyramid.reload_templates':'1'})
+        self.assertEqual(result['reload_templates'], True)
+        self.assertEqual(result['pyramid.reload_templates'], True)
+        result = self._makeOne({'reload_templates':'false'},
+                               {'PYRAMID_RELOAD_TEMPLATES':'1'})
+        self.assertEqual(result['reload_templates'], True)
+        self.assertEqual(result['pyramid.reload_templates'], True)
+
+    def test_reload_resources(self):
+        # alias for reload_assets
+        result = self._makeOne({})
+        self.assertEqual(result['reload_resources'], False)
+        self.assertEqual(result['reload_assets'], False)
+        self.assertEqual(result['pyramid.reload_resources'], False)
+        self.assertEqual(result['pyramid.reload_assets'], False)
+        result = self._makeOne({'reload_resources':'false'})
+        self.assertEqual(result['reload_resources'], False)
+        self.assertEqual(result['reload_assets'], False)
+        self.assertEqual(result['pyramid.reload_resources'], False)
+        self.assertEqual(result['pyramid.reload_assets'], False)
+        result = self._makeOne({'reload_resources':'t'})
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        result = self._makeOne({'reload_resources':'1'})
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        result = self._makeOne({'pyramid.reload_resources':'1'})
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        result = self._makeOne({}, {'PYRAMID_RELOAD_RESOURCES':'1'})
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        result = self._makeOne({'reload_resources':'false',
+                                'pyramid.reload_resources':'1'})
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        result = self._makeOne({'reload_resources':'false',
+                                'pyramid.reload_resources':'false'},
+                               {'PYRAMID_RELOAD_RESOURCES':'1'})
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+
+    def test_reload_assets(self):
+        # alias for reload_resources
+        result = self._makeOne({})
+        self.assertEqual(result['reload_assets'], False)
+        self.assertEqual(result['reload_resources'], False)
+        self.assertEqual(result['pyramid.reload_assets'], False)
+        self.assertEqual(result['pyramid.reload_resources'], False)
+        result = self._makeOne({'reload_assets':'false'})
+        self.assertEqual(result['reload_resources'], False)
+        self.assertEqual(result['reload_assets'], False)
+        self.assertEqual(result['pyramid.reload_assets'], False)
+        self.assertEqual(result['pyramid.reload_resources'], False)
+        result = self._makeOne({'reload_assets':'t'})
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        result = self._makeOne({'reload_assets':'1'})
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        result = self._makeOne({'pyramid.reload_assets':'1'})
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        result = self._makeOne({}, {'PYRAMID_RELOAD_ASSETS':'1'})
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        result = self._makeOne({'reload_assets':'false',
+                                'pyramid.reload_assets':'1'})
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        result = self._makeOne({'reload_assets':'false',
+                                'pyramid.reload_assets':'false'},
+                               {'PYRAMID_RELOAD_ASSETS':'1'})
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+
+    def test_reload_all(self):
+        result = self._makeOne({})
+        self.assertEqual(result['reload_templates'], False)
+        self.assertEqual(result['reload_resources'], False)
+        self.assertEqual(result['reload_assets'], False)
+        self.assertEqual(result['pyramid.reload_templates'], False)
+        self.assertEqual(result['pyramid.reload_resources'], False)
+        self.assertEqual(result['pyramid.reload_assets'], False)
+        result = self._makeOne({'reload_all':'false'})
+        self.assertEqual(result['reload_templates'], False)
+        self.assertEqual(result['reload_resources'], False)
+        self.assertEqual(result['reload_assets'], False)
+        self.assertEqual(result['pyramid.reload_templates'], False)
+        self.assertEqual(result['pyramid.reload_resources'], False)
+        self.assertEqual(result['pyramid.reload_assets'], False)
+        result = self._makeOne({'reload_all':'t'})
+        self.assertEqual(result['reload_templates'], True)
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_templates'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        result = self._makeOne({'reload_all':'1'})
+        self.assertEqual(result['reload_templates'], True)
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_templates'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        result = self._makeOne({'pyramid.reload_all':'1'})
+        self.assertEqual(result['reload_templates'], True)
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_templates'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        result = self._makeOne({}, {'PYRAMID_RELOAD_ALL':'1'})
+        self.assertEqual(result['reload_templates'], True)
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_templates'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        result = self._makeOne({'reload_all':'false',
+                                'pyramid.reload_all':'1'})
+        self.assertEqual(result['reload_templates'], True)
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_templates'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+        result = self._makeOne({'reload_all':'false',
+                                'pyramid.reload_all':'false'},
+                               {'PYRAMID_RELOAD_ALL':'1'})
+        self.assertEqual(result['reload_templates'], True)
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['pyramid.reload_templates'], True)
+        self.assertEqual(result['pyramid.reload_resources'], True)
+        self.assertEqual(result['pyramid.reload_assets'], True)
+
+    def test_debug_authorization(self):
+        result = self._makeOne({})
+        self.assertEqual(result['debug_authorization'], False)
+        self.assertEqual(result['pyramid.debug_authorization'], False)
+        result = self._makeOne({'debug_authorization':'false'})
+        self.assertEqual(result['debug_authorization'], False)
+        self.assertEqual(result['pyramid.debug_authorization'], False)
+        result = self._makeOne({'debug_authorization':'t'})
+        self.assertEqual(result['debug_authorization'], True)
+        self.assertEqual(result['pyramid.debug_authorization'], True)
+        result = self._makeOne({'debug_authorization':'1'})
+        self.assertEqual(result['debug_authorization'], True)
+        self.assertEqual(result['pyramid.debug_authorization'], True)
+        result = self._makeOne({'pyramid.debug_authorization':'1'})
+        self.assertEqual(result['debug_authorization'], True)
+        self.assertEqual(result['pyramid.debug_authorization'], True)
+        result = self._makeOne({}, {'PYRAMID_DEBUG_AUTHORIZATION':'1'})
+        self.assertEqual(result['debug_authorization'], True)
+        self.assertEqual(result['pyramid.debug_authorization'], True)
+        result = self._makeOne({'debug_authorization':'false',
+                                'pyramid.debug_authorization':'1'})
+        self.assertEqual(result['debug_authorization'], True)
+        self.assertEqual(result['pyramid.debug_authorization'], True)
+        result = self._makeOne({'debug_authorization':'false',
+                                'pyramid.debug_authorization':'false'},
+                               {'PYRAMID_DEBUG_AUTHORIZATION':'1'})
+        self.assertEqual(result['debug_authorization'], True)
+        self.assertEqual(result['pyramid.debug_authorization'], True)
+
+    def test_debug_notfound(self):
+        result = self._makeOne({})
+        self.assertEqual(result['debug_notfound'], False)
+        self.assertEqual(result['pyramid.debug_notfound'], False)
+        result = self._makeOne({'debug_notfound':'false'})
+        self.assertEqual(result['debug_notfound'], False)
+        self.assertEqual(result['pyramid.debug_notfound'], False)
+        result = self._makeOne({'debug_notfound':'t'})
+        self.assertEqual(result['debug_notfound'], True)
+        self.assertEqual(result['pyramid.debug_notfound'], True)
+        result = self._makeOne({'debug_notfound':'1'})
+        self.assertEqual(result['debug_notfound'], True)
+        self.assertEqual(result['pyramid.debug_notfound'], True)
+        result = self._makeOne({'pyramid.debug_notfound':'1'})
+        self.assertEqual(result['debug_notfound'], True)
+        self.assertEqual(result['pyramid.debug_notfound'], True)
+        result = self._makeOne({}, {'PYRAMID_DEBUG_NOTFOUND':'1'})
+        self.assertEqual(result['debug_notfound'], True)
+        self.assertEqual(result['pyramid.debug_notfound'], True)
+        result = self._makeOne({'debug_notfound':'false',
+                                'pyramid.debug_notfound':'1'})
+        self.assertEqual(result['debug_notfound'], True)
+        self.assertEqual(result['pyramid.debug_notfound'], True)
+        result = self._makeOne({'debug_notfound':'false',
+                                'pyramid.debug_notfound':'false'},
+                               {'PYRAMID_DEBUG_NOTFOUND':'1'})
+        self.assertEqual(result['debug_notfound'], True)
+        self.assertEqual(result['pyramid.debug_notfound'], True)
+
+    def test_debug_routematch(self):
+        result = self._makeOne({})
+        self.assertEqual(result['debug_routematch'], False)
+        self.assertEqual(result['pyramid.debug_routematch'], False)
+        result = self._makeOne({'debug_routematch':'false'})
+        self.assertEqual(result['debug_routematch'], False)
+        self.assertEqual(result['pyramid.debug_routematch'], False)
+        result = self._makeOne({'debug_routematch':'t'})
+        self.assertEqual(result['debug_routematch'], True)
+        self.assertEqual(result['pyramid.debug_routematch'], True)
+        result = self._makeOne({'debug_routematch':'1'})
+        self.assertEqual(result['debug_routematch'], True)
+        self.assertEqual(result['pyramid.debug_routematch'], True)
+        result = self._makeOne({'pyramid.debug_routematch':'1'})
+        self.assertEqual(result['debug_routematch'], True)
+        self.assertEqual(result['pyramid.debug_routematch'], True)
+        result = self._makeOne({}, {'PYRAMID_DEBUG_ROUTEMATCH':'1'})
+        self.assertEqual(result['debug_routematch'], True)
+        self.assertEqual(result['pyramid.debug_routematch'], True)
+        result = self._makeOne({'debug_routematch':'false',
+                                'pyramid.debug_routematch':'1'})
+        self.assertEqual(result['debug_routematch'], True)
+        self.assertEqual(result['pyramid.debug_routematch'], True)
+        result = self._makeOne({'debug_routematch':'false',
+                                'pyramid.debug_routematch':'false'},
+                               {'PYRAMID_DEBUG_ROUTEMATCH':'1'})
+        self.assertEqual(result['debug_routematch'], True)
+        self.assertEqual(result['pyramid.debug_routematch'], True)
+
+    def test_debug_templates(self):
+        result = self._makeOne({})
+        self.assertEqual(result['debug_templates'], False)
+        self.assertEqual(result['pyramid.debug_templates'], False)
+        result = self._makeOne({'debug_templates':'false'})
+        self.assertEqual(result['debug_templates'], False)
+        self.assertEqual(result['pyramid.debug_templates'], False)
+        result = self._makeOne({'debug_templates':'t'})
+        self.assertEqual(result['debug_templates'], True)
+        self.assertEqual(result['pyramid.debug_templates'], True)
+        result = self._makeOne({'debug_templates':'1'})
+        self.assertEqual(result['debug_templates'], True)
+        self.assertEqual(result['pyramid.debug_templates'], True)
+        result = self._makeOne({'pyramid.debug_templates':'1'})
+        self.assertEqual(result['debug_templates'], True)
+        self.assertEqual(result['pyramid.debug_templates'], True)
+        result = self._makeOne({}, {'PYRAMID_DEBUG_TEMPLATES':'1'})
+        self.assertEqual(result['debug_templates'], True)
+        self.assertEqual(result['pyramid.debug_templates'], True)
+        result = self._makeOne({'debug_templates':'false',
+                                'pyramid.debug_templates':'1'})
+        self.assertEqual(result['debug_templates'], True)
+        self.assertEqual(result['pyramid.debug_templates'], True)
+        result = self._makeOne({'debug_templates':'false',
+                                'pyramid.debug_templates':'false'},
+                               {'PYRAMID_DEBUG_TEMPLATES':'1'})
+        self.assertEqual(result['debug_templates'], True)
+        self.assertEqual(result['pyramid.debug_templates'], True)
+
+    def test_debug_all(self):
+        result = self._makeOne({})
+        self.assertEqual(result['debug_notfound'], False)
+        self.assertEqual(result['debug_routematch'], False)
+        self.assertEqual(result['debug_authorization'], False)
+        self.assertEqual(result['debug_templates'], False)
+        self.assertEqual(result['pyramid.debug_notfound'], False)
+        self.assertEqual(result['pyramid.debug_routematch'], False)
+        self.assertEqual(result['pyramid.debug_authorization'], False)
+        self.assertEqual(result['pyramid.debug_templates'], False)
+        result = self._makeOne({'debug_all':'false'})
+        self.assertEqual(result['debug_notfound'], False)
+        self.assertEqual(result['debug_routematch'], False)
+        self.assertEqual(result['debug_authorization'], False)
+        self.assertEqual(result['debug_templates'], False)
+        self.assertEqual(result['pyramid.debug_notfound'], False)
+        self.assertEqual(result['pyramid.debug_routematch'], False)
+        self.assertEqual(result['pyramid.debug_authorization'], False)
+        self.assertEqual(result['pyramid.debug_templates'], False)
+        result = self._makeOne({'debug_all':'t'})
+        self.assertEqual(result['debug_notfound'], True)
+        self.assertEqual(result['debug_routematch'], True)
+        self.assertEqual(result['debug_authorization'], True)
+        self.assertEqual(result['debug_templates'], True)
+        self.assertEqual(result['pyramid.debug_notfound'], True)
+        self.assertEqual(result['pyramid.debug_routematch'], True)
+        self.assertEqual(result['pyramid.debug_authorization'], True)
+        self.assertEqual(result['pyramid.debug_templates'], True)
+        result = self._makeOne({'debug_all':'1'})
+        self.assertEqual(result['debug_notfound'], True)
+        self.assertEqual(result['debug_routematch'], True)
+        self.assertEqual(result['debug_authorization'], True)
+        self.assertEqual(result['debug_templates'], True)
+        self.assertEqual(result['pyramid.debug_notfound'], True)
+        self.assertEqual(result['pyramid.debug_routematch'], True)
+        self.assertEqual(result['pyramid.debug_authorization'], True)
+        self.assertEqual(result['pyramid.debug_templates'], True)
+        result = self._makeOne({'pyramid.debug_all':'1'})
+        self.assertEqual(result['debug_notfound'], True)
+        self.assertEqual(result['debug_routematch'], True)
+        self.assertEqual(result['debug_authorization'], True)
+        self.assertEqual(result['debug_templates'], True)
+        self.assertEqual(result['pyramid.debug_notfound'], True)
+        self.assertEqual(result['pyramid.debug_routematch'], True)
+        self.assertEqual(result['pyramid.debug_authorization'], True)
+        self.assertEqual(result['pyramid.debug_templates'], True)
+        result = self._makeOne({}, {'PYRAMID_DEBUG_ALL':'1'})
+        self.assertEqual(result['debug_notfound'], True)
+        self.assertEqual(result['debug_routematch'], True)
+        self.assertEqual(result['debug_authorization'], True)
+        self.assertEqual(result['debug_templates'], True)
+        self.assertEqual(result['pyramid.debug_notfound'], True)
+        self.assertEqual(result['pyramid.debug_routematch'], True)
+        self.assertEqual(result['pyramid.debug_authorization'], True)
+        self.assertEqual(result['pyramid.debug_templates'], True)
+        result = self._makeOne({'debug_all':'false',
+                                'pyramid.debug_all':'1'})
+        self.assertEqual(result['debug_notfound'], True)
+        self.assertEqual(result['debug_routematch'], True)
+        self.assertEqual(result['debug_authorization'], True)
+        self.assertEqual(result['debug_templates'], True)
+        self.assertEqual(result['pyramid.debug_notfound'], True)
+        self.assertEqual(result['pyramid.debug_routematch'], True)
+        self.assertEqual(result['pyramid.debug_authorization'], True)
+        self.assertEqual(result['pyramid.debug_templates'], True)
+        result = self._makeOne({'debug_all':'false',
+                                'pyramid.debug_all':'false'},
+                               {'PYRAMID_DEBUG_ALL':'1'})
+        self.assertEqual(result['debug_notfound'], True)
+        self.assertEqual(result['debug_routematch'], True)
+        self.assertEqual(result['debug_authorization'], True)
+        self.assertEqual(result['debug_templates'], True)
+        self.assertEqual(result['pyramid.debug_notfound'], True)
+        self.assertEqual(result['pyramid.debug_routematch'], True)
+        self.assertEqual(result['pyramid.debug_authorization'], True)
+        self.assertEqual(result['pyramid.debug_templates'], True)
+
+    def test_default_locale_name(self):
+        result = self._makeOne({})
+        self.assertEqual(result['default_locale_name'], 'en')
+        self.assertEqual(result['pyramid.default_locale_name'], 'en')
+        result = self._makeOne({'default_locale_name':'abc'})
+        self.assertEqual(result['default_locale_name'], 'abc')
+        self.assertEqual(result['pyramid.default_locale_name'], 'abc')
+        result = self._makeOne({'pyramid.default_locale_name':'abc'})
+        self.assertEqual(result['default_locale_name'], 'abc')
+        self.assertEqual(result['pyramid.default_locale_name'], 'abc')
+        result = self._makeOne({}, {'PYRAMID_DEFAULT_LOCALE_NAME':'abc'})
+        self.assertEqual(result['default_locale_name'], 'abc')
+        self.assertEqual(result['pyramid.default_locale_name'], 'abc')
+        result = self._makeOne({'default_locale_name':'def',
+                                'pyramid.default_locale_name':'abc'})
+        self.assertEqual(result['default_locale_name'], 'abc')
+        self.assertEqual(result['pyramid.default_locale_name'], 'abc')
+        result = self._makeOne({'default_locale_name':'def',
+                                'pyramid.default_locale_name':'ghi'},
+                               {'PYRAMID_DEFAULT_LOCALE_NAME':'abc'})
+        self.assertEqual(result['default_locale_name'], 'abc')
+        self.assertEqual(result['pyramid.default_locale_name'], 'abc')
+
+    def test_originals_kept(self):
+        result = self._makeOne({'a':'i am so a'})
+        self.assertEqual(result['a'], 'i am so a')
+
+
diff --git a/pyramid/tests/test_settings.py b/pyramid/tests/test_settings.py
index a85203d4e..709a36bc3 100644
--- a/pyramid/tests/test_settings.py
+++ b/pyramid/tests/test_settings.py
@@ -1,478 +1,6 @@
 import unittest
 from pyramid import testing
 
-class TestSettings(unittest.TestCase):
-    def setUp(self):
-        from zope.deprecation import __show__
-        __show__.off()
-
-    def tearDown(self):
-        from zope.deprecation import __show__
-        __show__.on()
-        
-    def _getTargetClass(self):
-        from pyramid.settings import Settings
-        return Settings
-
-    def _makeOne(self, d=None, environ=None):
-        if environ is None:
-            environ = {}
-        klass = self._getTargetClass()
-        return klass(d, _environ_=environ)
-
-    def test_getattr(self):
-        settings = self._makeOne({'reload_templates':False})
-        self.assertEqual(settings.reload_templates, False)
-
-    def test_getattr_raises_attribute_error(self):
-        settings = self._makeOne()
-        self.assertRaises(AttributeError, settings.__getattr__, 'mykey')
-
-    def test_noargs(self):
-        settings = self._makeOne()
-        self.assertEqual(settings['debug_authorization'], False)
-        self.assertEqual(settings['debug_notfound'], False)
-        self.assertEqual(settings['debug_routematch'], False)
-        self.assertEqual(settings['reload_templates'], False)
-        self.assertEqual(settings['reload_resources'], False)
-
-        self.assertEqual(settings['pyramid.debug_authorization'], False)
-        self.assertEqual(settings['pyramid.debug_notfound'], False)
-        self.assertEqual(settings['pyramid.debug_routematch'], False)
-        self.assertEqual(settings['pyramid.reload_templates'], False)
-        self.assertEqual(settings['pyramid.reload_resources'], False)
-
-    def test_prevent_http_cache(self):
-        settings = self._makeOne({})
-        self.assertEqual(settings['prevent_http_cache'], False)
-        self.assertEqual(settings['pyramid.prevent_http_cache'], False)
-        result = self._makeOne({'prevent_http_cache':'false'})
-        self.assertEqual(result['prevent_http_cache'], False)
-        self.assertEqual(result['pyramid.prevent_http_cache'], False)
-        result = self._makeOne({'prevent_http_cache':'t'})
-        self.assertEqual(result['prevent_http_cache'], True)
-        self.assertEqual(result['pyramid.prevent_http_cache'], True)
-        result = self._makeOne({'prevent_http_cache':'1'})
-        self.assertEqual(result['prevent_http_cache'], True)
-        self.assertEqual(result['pyramid.prevent_http_cache'], True)
-        result = self._makeOne({'pyramid.prevent_http_cache':'t'})
-        self.assertEqual(result['prevent_http_cache'], True)
-        self.assertEqual(result['pyramid.prevent_http_cache'], True)
-        result = self._makeOne({}, {'PYRAMID_PREVENT_HTTP_CACHE':'1'})
-        self.assertEqual(result['prevent_http_cache'], True)
-        self.assertEqual(result['pyramid.prevent_http_cache'], True)
-        result = self._makeOne({'prevent_http_cache':'false',
-                                'pyramid.prevent_http_cache':'1'})
-        self.assertEqual(result['prevent_http_cache'], True)
-        self.assertEqual(result['pyramid.prevent_http_cache'], True)
-        result = self._makeOne({'prevent_http_cache':'false',
-                                'pyramid.prevent_http_cache':'f'},
-                               {'PYRAMID_PREVENT_HTTP_CACHE':'1'})
-        self.assertEqual(result['prevent_http_cache'], True)
-        self.assertEqual(result['pyramid.prevent_http_cache'], True)
-
-    def test_reload_templates(self):
-        settings = self._makeOne({})
-        self.assertEqual(settings['reload_templates'], False)
-        self.assertEqual(settings['pyramid.reload_templates'], False)
-        result = self._makeOne({'reload_templates':'false'})
-        self.assertEqual(result['reload_templates'], False)
-        self.assertEqual(result['pyramid.reload_templates'], False)
-        result = self._makeOne({'reload_templates':'t'})
-        self.assertEqual(result['reload_templates'], True)
-        self.assertEqual(result['pyramid.reload_templates'], True)
-        result = self._makeOne({'reload_templates':'1'})
-        self.assertEqual(result['reload_templates'], True)
-        self.assertEqual(result['pyramid.reload_templates'], True)
-        result = self._makeOne({'pyramid.reload_templates':'1'})
-        self.assertEqual(result['reload_templates'], True)
-        self.assertEqual(result['pyramid.reload_templates'], True)
-        result = self._makeOne({}, {'PYRAMID_RELOAD_TEMPLATES':'1'})
-        self.assertEqual(result['reload_templates'], True)
-        self.assertEqual(result['pyramid.reload_templates'], True)
-        result = self._makeOne({'reload_templates':'false',
-                                'pyramid.reload_templates':'1'})
-        self.assertEqual(result['reload_templates'], True)
-        self.assertEqual(result['pyramid.reload_templates'], True)
-        result = self._makeOne({'reload_templates':'false'},
-                               {'PYRAMID_RELOAD_TEMPLATES':'1'})
-        self.assertEqual(result['reload_templates'], True)
-        self.assertEqual(result['pyramid.reload_templates'], True)
-
-    def test_reload_resources(self):
-        # alias for reload_assets
-        result = self._makeOne({})
-        self.assertEqual(result['reload_resources'], False)
-        self.assertEqual(result['reload_assets'], False)
-        self.assertEqual(result['pyramid.reload_resources'], False)
-        self.assertEqual(result['pyramid.reload_assets'], False)
-        result = self._makeOne({'reload_resources':'false'})
-        self.assertEqual(result['reload_resources'], False)
-        self.assertEqual(result['reload_assets'], False)
-        self.assertEqual(result['pyramid.reload_resources'], False)
-        self.assertEqual(result['pyramid.reload_assets'], False)
-        result = self._makeOne({'reload_resources':'t'})
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        result = self._makeOne({'reload_resources':'1'})
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        result = self._makeOne({'pyramid.reload_resources':'1'})
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        result = self._makeOne({}, {'PYRAMID_RELOAD_RESOURCES':'1'})
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        result = self._makeOne({'reload_resources':'false',
-                                'pyramid.reload_resources':'1'})
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        result = self._makeOne({'reload_resources':'false',
-                                'pyramid.reload_resources':'false'},
-                               {'PYRAMID_RELOAD_RESOURCES':'1'})
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-
-    def test_reload_assets(self):
-        # alias for reload_resources
-        result = self._makeOne({})
-        self.assertEqual(result['reload_assets'], False)
-        self.assertEqual(result['reload_resources'], False)
-        self.assertEqual(result['pyramid.reload_assets'], False)
-        self.assertEqual(result['pyramid.reload_resources'], False)
-        result = self._makeOne({'reload_assets':'false'})
-        self.assertEqual(result['reload_resources'], False)
-        self.assertEqual(result['reload_assets'], False)
-        self.assertEqual(result['pyramid.reload_assets'], False)
-        self.assertEqual(result['pyramid.reload_resources'], False)
-        result = self._makeOne({'reload_assets':'t'})
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        result = self._makeOne({'reload_assets':'1'})
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        result = self._makeOne({'pyramid.reload_assets':'1'})
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        result = self._makeOne({}, {'PYRAMID_RELOAD_ASSETS':'1'})
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        result = self._makeOne({'reload_assets':'false',
-                                'pyramid.reload_assets':'1'})
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        result = self._makeOne({'reload_assets':'false',
-                                'pyramid.reload_assets':'false'},
-                               {'PYRAMID_RELOAD_ASSETS':'1'})
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-
-    def test_reload_all(self):
-        result = self._makeOne({})
-        self.assertEqual(result['reload_templates'], False)
-        self.assertEqual(result['reload_resources'], False)
-        self.assertEqual(result['reload_assets'], False)
-        self.assertEqual(result['pyramid.reload_templates'], False)
-        self.assertEqual(result['pyramid.reload_resources'], False)
-        self.assertEqual(result['pyramid.reload_assets'], False)
-        result = self._makeOne({'reload_all':'false'})
-        self.assertEqual(result['reload_templates'], False)
-        self.assertEqual(result['reload_resources'], False)
-        self.assertEqual(result['reload_assets'], False)
-        self.assertEqual(result['pyramid.reload_templates'], False)
-        self.assertEqual(result['pyramid.reload_resources'], False)
-        self.assertEqual(result['pyramid.reload_assets'], False)
-        result = self._makeOne({'reload_all':'t'})
-        self.assertEqual(result['reload_templates'], True)
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_templates'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        result = self._makeOne({'reload_all':'1'})
-        self.assertEqual(result['reload_templates'], True)
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_templates'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        result = self._makeOne({'pyramid.reload_all':'1'})
-        self.assertEqual(result['reload_templates'], True)
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_templates'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        result = self._makeOne({}, {'PYRAMID_RELOAD_ALL':'1'})
-        self.assertEqual(result['reload_templates'], True)
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_templates'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        result = self._makeOne({'reload_all':'false',
-                                'pyramid.reload_all':'1'})
-        self.assertEqual(result['reload_templates'], True)
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_templates'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-        result = self._makeOne({'reload_all':'false',
-                                'pyramid.reload_all':'false'},
-                               {'PYRAMID_RELOAD_ALL':'1'})
-        self.assertEqual(result['reload_templates'], True)
-        self.assertEqual(result['reload_resources'], True)
-        self.assertEqual(result['reload_assets'], True)
-        self.assertEqual(result['pyramid.reload_templates'], True)
-        self.assertEqual(result['pyramid.reload_resources'], True)
-        self.assertEqual(result['pyramid.reload_assets'], True)
-
-    def test_debug_authorization(self):
-        result = self._makeOne({})
-        self.assertEqual(result['debug_authorization'], False)
-        self.assertEqual(result['pyramid.debug_authorization'], False)
-        result = self._makeOne({'debug_authorization':'false'})
-        self.assertEqual(result['debug_authorization'], False)
-        self.assertEqual(result['pyramid.debug_authorization'], False)
-        result = self._makeOne({'debug_authorization':'t'})
-        self.assertEqual(result['debug_authorization'], True)
-        self.assertEqual(result['pyramid.debug_authorization'], True)
-        result = self._makeOne({'debug_authorization':'1'})
-        self.assertEqual(result['debug_authorization'], True)
-        self.assertEqual(result['pyramid.debug_authorization'], True)
-        result = self._makeOne({'pyramid.debug_authorization':'1'})
-        self.assertEqual(result['debug_authorization'], True)
-        self.assertEqual(result['pyramid.debug_authorization'], True)
-        result = self._makeOne({}, {'PYRAMID_DEBUG_AUTHORIZATION':'1'})
-        self.assertEqual(result['debug_authorization'], True)
-        self.assertEqual(result['pyramid.debug_authorization'], True)
-        result = self._makeOne({'debug_authorization':'false',
-                                'pyramid.debug_authorization':'1'})
-        self.assertEqual(result['debug_authorization'], True)
-        self.assertEqual(result['pyramid.debug_authorization'], True)
-        result = self._makeOne({'debug_authorization':'false',
-                                'pyramid.debug_authorization':'false'},
-                               {'PYRAMID_DEBUG_AUTHORIZATION':'1'})
-        self.assertEqual(result['debug_authorization'], True)
-        self.assertEqual(result['pyramid.debug_authorization'], True)
-
-    def test_debug_notfound(self):
-        result = self._makeOne({})
-        self.assertEqual(result['debug_notfound'], False)
-        self.assertEqual(result['pyramid.debug_notfound'], False)
-        result = self._makeOne({'debug_notfound':'false'})
-        self.assertEqual(result['debug_notfound'], False)
-        self.assertEqual(result['pyramid.debug_notfound'], False)
-        result = self._makeOne({'debug_notfound':'t'})
-        self.assertEqual(result['debug_notfound'], True)
-        self.assertEqual(result['pyramid.debug_notfound'], True)
-        result = self._makeOne({'debug_notfound':'1'})
-        self.assertEqual(result['debug_notfound'], True)
-        self.assertEqual(result['pyramid.debug_notfound'], True)
-        result = self._makeOne({'pyramid.debug_notfound':'1'})
-        self.assertEqual(result['debug_notfound'], True)
-        self.assertEqual(result['pyramid.debug_notfound'], True)
-        result = self._makeOne({}, {'PYRAMID_DEBUG_NOTFOUND':'1'})
-        self.assertEqual(result['debug_notfound'], True)
-        self.assertEqual(result['pyramid.debug_notfound'], True)
-        result = self._makeOne({'debug_notfound':'false',
-                                'pyramid.debug_notfound':'1'})
-        self.assertEqual(result['debug_notfound'], True)
-        self.assertEqual(result['pyramid.debug_notfound'], True)
-        result = self._makeOne({'debug_notfound':'false',
-                                'pyramid.debug_notfound':'false'},
-                               {'PYRAMID_DEBUG_NOTFOUND':'1'})
-        self.assertEqual(result['debug_notfound'], True)
-        self.assertEqual(result['pyramid.debug_notfound'], True)
-
-    def test_debug_routematch(self):
-        result = self._makeOne({})
-        self.assertEqual(result['debug_routematch'], False)
-        self.assertEqual(result['pyramid.debug_routematch'], False)
-        result = self._makeOne({'debug_routematch':'false'})
-        self.assertEqual(result['debug_routematch'], False)
-        self.assertEqual(result['pyramid.debug_routematch'], False)
-        result = self._makeOne({'debug_routematch':'t'})
-        self.assertEqual(result['debug_routematch'], True)
-        self.assertEqual(result['pyramid.debug_routematch'], True)
-        result = self._makeOne({'debug_routematch':'1'})
-        self.assertEqual(result['debug_routematch'], True)
-        self.assertEqual(result['pyramid.debug_routematch'], True)
-        result = self._makeOne({'pyramid.debug_routematch':'1'})
-        self.assertEqual(result['debug_routematch'], True)
-        self.assertEqual(result['pyramid.debug_routematch'], True)
-        result = self._makeOne({}, {'PYRAMID_DEBUG_ROUTEMATCH':'1'})
-        self.assertEqual(result['debug_routematch'], True)
-        self.assertEqual(result['pyramid.debug_routematch'], True)
-        result = self._makeOne({'debug_routematch':'false',
-                                'pyramid.debug_routematch':'1'})
-        self.assertEqual(result['debug_routematch'], True)
-        self.assertEqual(result['pyramid.debug_routematch'], True)
-        result = self._makeOne({'debug_routematch':'false',
-                                'pyramid.debug_routematch':'false'},
-                               {'PYRAMID_DEBUG_ROUTEMATCH':'1'})
-        self.assertEqual(result['debug_routematch'], True)
-        self.assertEqual(result['pyramid.debug_routematch'], True)
-
-    def test_debug_templates(self):
-        result = self._makeOne({})
-        self.assertEqual(result['debug_templates'], False)
-        self.assertEqual(result['pyramid.debug_templates'], False)
-        result = self._makeOne({'debug_templates':'false'})
-        self.assertEqual(result['debug_templates'], False)
-        self.assertEqual(result['pyramid.debug_templates'], False)
-        result = self._makeOne({'debug_templates':'t'})
-        self.assertEqual(result['debug_templates'], True)
-        self.assertEqual(result['pyramid.debug_templates'], True)
-        result = self._makeOne({'debug_templates':'1'})
-        self.assertEqual(result['debug_templates'], True)
-        self.assertEqual(result['pyramid.debug_templates'], True)
-        result = self._makeOne({'pyramid.debug_templates':'1'})
-        self.assertEqual(result['debug_templates'], True)
-        self.assertEqual(result['pyramid.debug_templates'], True)
-        result = self._makeOne({}, {'PYRAMID_DEBUG_TEMPLATES':'1'})
-        self.assertEqual(result['debug_templates'], True)
-        self.assertEqual(result['pyramid.debug_templates'], True)
-        result = self._makeOne({'debug_templates':'false',
-                                'pyramid.debug_templates':'1'})
-        self.assertEqual(result['debug_templates'], True)
-        self.assertEqual(result['pyramid.debug_templates'], True)
-        result = self._makeOne({'debug_templates':'false',
-                                'pyramid.debug_templates':'false'},
-                               {'PYRAMID_DEBUG_TEMPLATES':'1'})
-        self.assertEqual(result['debug_templates'], True)
-        self.assertEqual(result['pyramid.debug_templates'], True)
-
-    def test_debug_all(self):
-        result = self._makeOne({})
-        self.assertEqual(result['debug_notfound'], False)
-        self.assertEqual(result['debug_routematch'], False)
-        self.assertEqual(result['debug_authorization'], False)
-        self.assertEqual(result['debug_templates'], False)
-        self.assertEqual(result['pyramid.debug_notfound'], False)
-        self.assertEqual(result['pyramid.debug_routematch'], False)
-        self.assertEqual(result['pyramid.debug_authorization'], False)
-        self.assertEqual(result['pyramid.debug_templates'], False)
-        result = self._makeOne({'debug_all':'false'})
-        self.assertEqual(result['debug_notfound'], False)
-        self.assertEqual(result['debug_routematch'], False)
-        self.assertEqual(result['debug_authorization'], False)
-        self.assertEqual(result['debug_templates'], False)
-        self.assertEqual(result['pyramid.debug_notfound'], False)
-        self.assertEqual(result['pyramid.debug_routematch'], False)
-        self.assertEqual(result['pyramid.debug_authorization'], False)
-        self.assertEqual(result['pyramid.debug_templates'], False)
-        result = self._makeOne({'debug_all':'t'})
-        self.assertEqual(result['debug_notfound'], True)
-        self.assertEqual(result['debug_routematch'], True)
-        self.assertEqual(result['debug_authorization'], True)
-        self.assertEqual(result['debug_templates'], True)
-        self.assertEqual(result['pyramid.debug_notfound'], True)
-        self.assertEqual(result['pyramid.debug_routematch'], True)
-        self.assertEqual(result['pyramid.debug_authorization'], True)
-        self.assertEqual(result['pyramid.debug_templates'], True)
-        result = self._makeOne({'debug_all':'1'})
-        self.assertEqual(result['debug_notfound'], True)
-        self.assertEqual(result['debug_routematch'], True)
-        self.assertEqual(result['debug_authorization'], True)
-        self.assertEqual(result['debug_templates'], True)
-        self.assertEqual(result['pyramid.debug_notfound'], True)
-        self.assertEqual(result['pyramid.debug_routematch'], True)
-        self.assertEqual(result['pyramid.debug_authorization'], True)
-        self.assertEqual(result['pyramid.debug_templates'], True)
-        result = self._makeOne({'pyramid.debug_all':'1'})
-        self.assertEqual(result['debug_notfound'], True)
-        self.assertEqual(result['debug_routematch'], True)
-        self.assertEqual(result['debug_authorization'], True)
-        self.assertEqual(result['debug_templates'], True)
-        self.assertEqual(result['pyramid.debug_notfound'], True)
-        self.assertEqual(result['pyramid.debug_routematch'], True)
-        self.assertEqual(result['pyramid.debug_authorization'], True)
-        self.assertEqual(result['pyramid.debug_templates'], True)
-        result = self._makeOne({}, {'PYRAMID_DEBUG_ALL':'1'})
-        self.assertEqual(result['debug_notfound'], True)
-        self.assertEqual(result['debug_routematch'], True)
-        self.assertEqual(result['debug_authorization'], True)
-        self.assertEqual(result['debug_templates'], True)
-        self.assertEqual(result['pyramid.debug_notfound'], True)
-        self.assertEqual(result['pyramid.debug_routematch'], True)
-        self.assertEqual(result['pyramid.debug_authorization'], True)
-        self.assertEqual(result['pyramid.debug_templates'], True)
-        result = self._makeOne({'debug_all':'false',
-                                'pyramid.debug_all':'1'})
-        self.assertEqual(result['debug_notfound'], True)
-        self.assertEqual(result['debug_routematch'], True)
-        self.assertEqual(result['debug_authorization'], True)
-        self.assertEqual(result['debug_templates'], True)
-        self.assertEqual(result['pyramid.debug_notfound'], True)
-        self.assertEqual(result['pyramid.debug_routematch'], True)
-        self.assertEqual(result['pyramid.debug_authorization'], True)
-        self.assertEqual(result['pyramid.debug_templates'], True)
-        result = self._makeOne({'debug_all':'false',
-                                'pyramid.debug_all':'false'},
-                               {'PYRAMID_DEBUG_ALL':'1'})
-        self.assertEqual(result['debug_notfound'], True)
-        self.assertEqual(result['debug_routematch'], True)
-        self.assertEqual(result['debug_authorization'], True)
-        self.assertEqual(result['debug_templates'], True)
-        self.assertEqual(result['pyramid.debug_notfound'], True)
-        self.assertEqual(result['pyramid.debug_routematch'], True)
-        self.assertEqual(result['pyramid.debug_authorization'], True)
-        self.assertEqual(result['pyramid.debug_templates'], True)
-
-    def test_default_locale_name(self):
-        result = self._makeOne({})
-        self.assertEqual(result['default_locale_name'], 'en')
-        self.assertEqual(result['pyramid.default_locale_name'], 'en')
-        result = self._makeOne({'default_locale_name':'abc'})
-        self.assertEqual(result['default_locale_name'], 'abc')
-        self.assertEqual(result['pyramid.default_locale_name'], 'abc')
-        result = self._makeOne({'pyramid.default_locale_name':'abc'})
-        self.assertEqual(result['default_locale_name'], 'abc')
-        self.assertEqual(result['pyramid.default_locale_name'], 'abc')
-        result = self._makeOne({}, {'PYRAMID_DEFAULT_LOCALE_NAME':'abc'})
-        self.assertEqual(result['default_locale_name'], 'abc')
-        self.assertEqual(result['pyramid.default_locale_name'], 'abc')
-        result = self._makeOne({'default_locale_name':'def',
-                                'pyramid.default_locale_name':'abc'})
-        self.assertEqual(result['default_locale_name'], 'abc')
-        self.assertEqual(result['pyramid.default_locale_name'], 'abc')
-        result = self._makeOne({'default_locale_name':'def',
-                                'pyramid.default_locale_name':'ghi'},
-                               {'PYRAMID_DEFAULT_LOCALE_NAME':'abc'})
-        self.assertEqual(result['default_locale_name'], 'abc')
-        self.assertEqual(result['pyramid.default_locale_name'], 'abc')
-
-    def test_originals_kept(self):
-        result = self._makeOne({'a':'i am so a'})
-        self.assertEqual(result['a'], 'i am so a')
-
-
 class TestGetSettings(unittest.TestCase):
     def setUp(self):
         from pyramid.registry import Registry