Added support in pyramid for "pyramid.*" settings prefixes.

These settings will override the previous settings keys but not the keys
from the environ.

2 files changed, 121 insertions, 24 deletions

diff --git a/pyramid/settings.py b/pyramid/settings.py
index 7ba53ea4c..0f19f5389 100644
--- a/pyramid/settings.py
+++ b/pyramid/settings.py
@@ -20,36 +20,54 @@ class Settings(dict):
         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', '')
-        eff_reload_all = asbool(eget('PYRAMID_RELOAD_ALL',config_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_resources = self.get('reload_resources', '')
+        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))
 
diff --git a/pyramid/tests/test_settings.py b/pyramid/tests/test_settings.py
index 75d653133..d8e039e5a 100644
--- a/pyramid/tests/test_settings.py
+++ b/pyramid/tests/test_settings.py
@@ -37,10 +37,16 @@ class TestSettings(unittest.TestCase):
         self.assertEqual(result['prevent_http_cache'], True)
         result = self._makeOne({'prevent_http_cache':'1'})
         self.assertEqual(result['prevent_http_cache'], True)
+        result = self._makeOne({'pyramid.prevent_http_cache':'t'})
+        self.assertEqual(result['prevent_http_cache'], True)
         result = self._makeOne({}, {'PYRAMID_PREVENT_HTTP_CACHE':'1'})
         self.assertEqual(result['prevent_http_cache'], True)
-        result = self._makeOne({'prevent_http_cache':'false'},
-                             {'PYRAMID_PREVENT_HTTP_CACHE':'1'})
+        result = self._makeOne({'prevent_http_cache':'false',
+                                'pyramid.prevent_http_cache':'1'})
+        self.assertEqual(result['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)
 
     def test_reload_templates(self):
@@ -52,10 +58,15 @@ class TestSettings(unittest.TestCase):
         self.assertEqual(result['reload_templates'], True)
         result = self._makeOne({'reload_templates':'1'})
         self.assertEqual(result['reload_templates'], True)
+        result = self._makeOne({'pyramid.reload_templates':'1'})
+        self.assertEqual(result['reload_templates'], True)
         result = self._makeOne({}, {'PYRAMID_RELOAD_TEMPLATES':'1'})
         self.assertEqual(result['reload_templates'], True)
+        result = self._makeOne({'reload_templates':'false',
+                                'pyramid.reload_templates':'1'})
+        self.assertEqual(result['reload_templates'], True)
         result = self._makeOne({'reload_templates':'false'},
-                             {'PYRAMID_RELOAD_TEMPLATES':'1'})
+                               {'PYRAMID_RELOAD_TEMPLATES':'1'})
         self.assertEqual(result['reload_templates'], True)
 
     def test_reload_resources(self):
@@ -72,11 +83,19 @@ class TestSettings(unittest.TestCase):
         result = self._makeOne({'reload_resources':'1'})
         self.assertEqual(result['reload_resources'], True)
         self.assertEqual(result['reload_assets'], True)
+        result = self._makeOne({'pyramid.reload_resources':'1'})
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['reload_assets'], True)
         result = self._makeOne({}, {'PYRAMID_RELOAD_RESOURCES':'1'})
         self.assertEqual(result['reload_resources'], True)
         self.assertEqual(result['reload_assets'], True)
-        result = self._makeOne({'reload_resources':'false'},
-                             {'PYRAMID_RELOAD_RESOURCES':'1'})
+        result = self._makeOne({'reload_resources':'false',
+                                'pyramid.reload_resources':'1'})
+        self.assertEqual(result['reload_resources'], True)
+        self.assertEqual(result['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)
 
@@ -94,11 +113,19 @@ class TestSettings(unittest.TestCase):
         result = self._makeOne({'reload_assets':'1'})
         self.assertEqual(result['reload_assets'], True)
         self.assertEqual(result['reload_resources'], True)
+        result = self._makeOne({'pyramid.reload_assets':'1'})
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['reload_resources'], True)
         result = self._makeOne({}, {'PYRAMID_RELOAD_ASSETS':'1'})
         self.assertEqual(result['reload_assets'], True)
         self.assertEqual(result['reload_resources'], True)
-        result = self._makeOne({'reload_assets':'false'},
-                             {'PYRAMID_RELOAD_ASSETS':'1'})
+        result = self._makeOne({'reload_assets':'false',
+                                'pyramid.reload_assets':'1'})
+        self.assertEqual(result['reload_assets'], True)
+        self.assertEqual(result['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)
 
@@ -120,12 +147,22 @@ class TestSettings(unittest.TestCase):
         self.assertEqual(result['reload_templates'], True)
         self.assertEqual(result['reload_resources'], True)
         self.assertEqual(result['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)
         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)
-        result = self._makeOne({'reload_all':'false'},
-                             {'PYRAMID_RELOAD_ALL':'1'})
+        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)
+        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)
@@ -139,10 +176,16 @@ class TestSettings(unittest.TestCase):
         self.assertEqual(result['debug_authorization'], True)
         result = self._makeOne({'debug_authorization':'1'})
         self.assertEqual(result['debug_authorization'], True)
+        result = self._makeOne({'pyramid.debug_authorization':'1'})
+        self.assertEqual(result['debug_authorization'], True)
         result = self._makeOne({}, {'PYRAMID_DEBUG_AUTHORIZATION':'1'})
         self.assertEqual(result['debug_authorization'], True)
-        result = self._makeOne({'debug_authorization':'false'},
-                             {'PYRAMID_DEBUG_AUTHORIZATION':'1'})
+        result = self._makeOne({'debug_authorization':'false',
+                                'pyramid.debug_authorization':'1'})
+        self.assertEqual(result['debug_authorization'], True)
+        result = self._makeOne({'debug_authorization':'false',
+                                'pyramid.debug_authorization':'false'},
+                               {'PYRAMID_DEBUG_AUTHORIZATION':'1'})
         self.assertEqual(result['debug_authorization'], True)
 
     def test_debug_notfound(self):
@@ -154,10 +197,16 @@ class TestSettings(unittest.TestCase):
         self.assertEqual(result['debug_notfound'], True)
         result = self._makeOne({'debug_notfound':'1'})
         self.assertEqual(result['debug_notfound'], True)
+        result = self._makeOne({'pyramid.debug_notfound':'1'})
+        self.assertEqual(result['debug_notfound'], True)
         result = self._makeOne({}, {'PYRAMID_DEBUG_NOTFOUND':'1'})
         self.assertEqual(result['debug_notfound'], True)
-        result = self._makeOne({'debug_notfound':'false'},
-                             {'PYRAMID_DEBUG_NOTFOUND':'1'})
+        result = self._makeOne({'debug_notfound':'false',
+                                'pyramid.debug_notfound':'1'})
+        self.assertEqual(result['debug_notfound'], True)
+        result = self._makeOne({'debug_notfound':'false',
+                                'pyramid.debug_notfound':'false'},
+                               {'PYRAMID_DEBUG_NOTFOUND':'1'})
         self.assertEqual(result['debug_notfound'], True)
 
     def test_debug_routematch(self):
@@ -169,10 +218,16 @@ class TestSettings(unittest.TestCase):
         self.assertEqual(result['debug_routematch'], True)
         result = self._makeOne({'debug_routematch':'1'})
         self.assertEqual(result['debug_routematch'], True)
+        result = self._makeOne({'pyramid.debug_routematch':'1'})
+        self.assertEqual(result['debug_routematch'], True)
         result = self._makeOne({}, {'PYRAMID_DEBUG_ROUTEMATCH':'1'})
         self.assertEqual(result['debug_routematch'], True)
-        result = self._makeOne({'debug_routematch':'false'},
-                             {'PYRAMID_DEBUG_ROUTEMATCH':'1'})
+        result = self._makeOne({'debug_routematch':'false',
+                                'pyramid.debug_routematch':'1'})
+        self.assertEqual(result['debug_routematch'], True)
+        result = self._makeOne({'debug_routematch':'false',
+                                'pyramid.debug_routematch':'false'},
+                               {'PYRAMID_DEBUG_ROUTEMATCH':'1'})
         self.assertEqual(result['debug_routematch'], True)
 
     def test_debug_templates(self):
@@ -184,10 +239,16 @@ class TestSettings(unittest.TestCase):
         self.assertEqual(result['debug_templates'], True)
         result = self._makeOne({'debug_templates':'1'})
         self.assertEqual(result['debug_templates'], True)
+        result = self._makeOne({'pyramid.debug_templates':'1'})
+        self.assertEqual(result['debug_templates'], True)
         result = self._makeOne({}, {'PYRAMID_DEBUG_TEMPLATES':'1'})
         self.assertEqual(result['debug_templates'], True)
-        result = self._makeOne({'debug_templates':'false'},
-                             {'PYRAMID_DEBUG_TEMPLATES':'1'})
+        result = self._makeOne({'debug_templates':'false',
+                                'pyramid.debug_templates':'1'})
+        self.assertEqual(result['debug_templates'], True)
+        result = self._makeOne({'debug_templates':'false',
+                                'pyramid.debug_templates':'false'},
+                               {'PYRAMID_DEBUG_TEMPLATES':'1'})
         self.assertEqual(result['debug_templates'], True)
 
     def test_debug_all(self):
@@ -211,13 +272,25 @@ class TestSettings(unittest.TestCase):
         self.assertEqual(result['debug_routematch'], True)
         self.assertEqual(result['debug_authorization'], True)
         self.assertEqual(result['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)
         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)
-        result = self._makeOne({'debug_all':'false'},
-                             {'PYRAMID_DEBUG_ALL':'1'})
+        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)
+        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)
@@ -228,10 +301,16 @@ class TestSettings(unittest.TestCase):
         self.assertEqual(result['default_locale_name'], 'en')
         result = self._makeOne({'default_locale_name':'abc'})
         self.assertEqual(result['default_locale_name'], 'abc')
+        result = self._makeOne({'pyramid.default_locale_name':'abc'})
+        self.assertEqual(result['default_locale_name'], 'abc')
         result = self._makeOne({}, {'PYRAMID_DEFAULT_LOCALE_NAME':'abc'})
         self.assertEqual(result['default_locale_name'], 'abc')
-        result = self._makeOne({'default_locale_name':'def'},
-                             {'PYRAMID_DEFAULT_LOCALE_NAME':'abc'})
+        result = self._makeOne({'default_locale_name':'def',
+                                'pyramid.default_locale_name':'abc'})
+        self.assertEqual(result['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')
 
     def test_originals_kept(self):