From eac892170c9d1e889f2462dc59fe1a9b2b33c239 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 25 Apr 2010 16:37:07 +0000 Subject: Fix default_locale_name. Add debug_templates setting. --- TODO.txt | 2 -- repoze/bfg/settings.py | 6 +++++- repoze/bfg/tests/test_settings.py | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/TODO.txt b/TODO.txt index 452e2d1e8..c38fa03f9 100644 --- a/TODO.txt +++ b/TODO.txt @@ -5,8 +5,6 @@ - Basic WSGI documentation (pipeline / app / server). -- Allow a translator to be supplied for template rendering. - - Allow a debug argument to be supplied for template rendering (requires Chameleon capable of accepting the ``debug`` argument to a template constructor; behavior currently implemented on Chameleon diff --git a/repoze/bfg/settings.py b/repoze/bfg/settings.py index 9cb2502a1..ff292dc7c 100644 --- a/repoze/bfg/settings.py +++ b/repoze/bfg/settings.py @@ -28,6 +28,9 @@ class Settings(dict): config_debug_notfound = self.get('debug_notfound', '') eff_debug_notfound = asbool(eget('BFG_DEBUG_NOTFOUND', config_debug_notfound)) + config_debug_templates = self.get('debug_templates', '') + eff_debug_templates = asbool(eget('BFG_DEBUG_TEMPLATES', + config_debug_templates)) config_reload_templates = self.get('reload_templates', '') eff_reload_templates = asbool(eget('BFG_RELOAD_TEMPLATES', config_reload_templates)) @@ -36,12 +39,13 @@ class Settings(dict): config_reload_resources)) configure_zcml = self.get('configure_zcml', '') eff_configure_zcml = eget('BFG_CONFIGURE_ZCML', configure_zcml) - locale_name = self.get('locale_name', 'en') + locale_name = self.get('default_locale_name', 'en') eff_locale_name = eget('BFG_DEFAULT_LOCALE_NAME', locale_name) update = { 'debug_authorization': eff_debug_all or eff_debug_auth, 'debug_notfound': eff_debug_all or eff_debug_notfound, + '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_resources, 'configure_zcml':eff_configure_zcml, diff --git a/repoze/bfg/tests/test_settings.py b/repoze/bfg/tests/test_settings.py index c86c21de2..be73f9dce 100644 --- a/repoze/bfg/tests/test_settings.py +++ b/repoze/bfg/tests/test_settings.py @@ -107,27 +107,48 @@ class TestSettings(unittest.TestCase): result = self._makeOne({'debug_notfound':'false'}, {'BFG_DEBUG_NOTFOUND':'1'}) self.assertEqual(result['debug_notfound'], True) - + + def test_debug_templates(self): + result = self._makeOne({}) + self.assertEqual(result['debug_templates'], False) + result = self._makeOne({'debug_templates':'false'}) + self.assertEqual(result['debug_templates'], False) + result = self._makeOne({'debug_templates':'t'}) + self.assertEqual(result['debug_templates'], True) + result = self._makeOne({'debug_templates':'1'}) + self.assertEqual(result['debug_templates'], True) + result = self._makeOne({}, {'BFG_DEBUG_TEMPLATES':'1'}) + self.assertEqual(result['debug_templates'], True) + result = self._makeOne({'debug_templates':'false'}, + {'BFG_DEBUG_TEMPLATES':'1'}) + self.assertEqual(result['debug_templates'], True) + def test_debug_all(self): result = self._makeOne({}) self.assertEqual(result['debug_notfound'], False) self.assertEqual(result['debug_authorization'], False) + self.assertEqual(result['debug_templates'], False) result = self._makeOne({'debug_all':'false'}) self.assertEqual(result['debug_notfound'], False) self.assertEqual(result['debug_authorization'], False) + self.assertEqual(result['debug_templates'], False) result = self._makeOne({'debug_all':'t'}) self.assertEqual(result['debug_notfound'], True) self.assertEqual(result['debug_authorization'], True) + self.assertEqual(result['debug_templates'], True) result = self._makeOne({'debug_all':'1'}) self.assertEqual(result['debug_notfound'], True) self.assertEqual(result['debug_authorization'], True) + self.assertEqual(result['debug_templates'], True) result = self._makeOne({}, {'BFG_DEBUG_ALL':'1'}) self.assertEqual(result['debug_notfound'], True) self.assertEqual(result['debug_authorization'], True) + self.assertEqual(result['debug_templates'], True) result = self._makeOne({'debug_all':'false'}, {'BFG_DEBUG_ALL':'1'}) self.assertEqual(result['debug_notfound'], True) self.assertEqual(result['debug_authorization'], True) + self.assertEqual(result['debug_templates'], True) def test_configure_zcml(self): result = self._makeOne({}) @@ -140,6 +161,17 @@ class TestSettings(unittest.TestCase): {'BFG_CONFIGURE_ZCML':'abc'}) self.assertEqual(result['configure_zcml'], 'abc') + def test_default_locale_name(self): + result = self._makeOne({}) + self.assertEqual(result['default_locale_name'], 'en') + result = self._makeOne({'default_locale_name':'abc'}) + self.assertEqual(result['default_locale_name'], 'abc') + result = self._makeOne({}, {'BFG_DEFAULT_LOCALE_NAME':'abc'}) + self.assertEqual(result['default_locale_name'], 'abc') + result = self._makeOne({'default_locale_name':'def'}, + {'BFG_DEFAULT_LOCALE_NAME':'abc'}) + self.assertEqual(result['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') -- cgit v1.2.3