Merge branch 'cleverdevil/config-dict' into cleverdevil/master

* cleverdevil/config-dict:
  Fixing configuration to correctly handle forced dictionaries
  Minor PEP8 changes

pecan/configuration.py

@@ -3,9 +3,15 @@ import inspect
 import os
 import string
 
+
 IDENTIFIER = re.compile(r'[a-z_](\w)*$', re.IGNORECASE)
 STRING_FORMAT = re.compile(r'{pecan\.conf(?P<var>([.][a-z_][\w]*)+)+?}', re.IGNORECASE)
 
+
+class ConfigDict(dict):
+    pass
+
+
 class ConfigString(object):
     def __init__(self, format_string):
         self.raw_string = format_string
@@ -37,24 +43,20 @@ class ConfigString(object):
     def contains_formatting(value):
         return STRING_FORMAT.match(value)
 
+
 class Config(object):
     def __init__(self, conf_dict={}):
         self.update(conf_dict)
 
     def update(self, conf_dict):
-        __force_dict__ = False
-        # first check the keys for correct
 
         if isinstance(conf_dict, dict):
-            if '__force_dict__' in conf_dict:
-                del conf_dict['__force_dict__']
-                __force_dict__ = True
             iterator = conf_dict.iteritems()
         else:
             iterator = iter(conf_dict)
             
         for k,v in iterator:
-            if not IDENTIFIER.match(k) and not __force_dict__:
+            if not IDENTIFIER.match(k):
                 raise ValueError('\'%s\' is not a valid indentifier' % k)
 
             cur_val = self.__dict__.get(k)
@@ -71,9 +73,10 @@ class Config(object):
         return self.__dict__[key]
 
     def __setitem__(self, key, value):
-        if isinstance(value, dict):
+        if isinstance(value, dict) and not isinstance(value, ConfigDict):
             if value.get('__force_dict__'):
-                self.__dict__[key] = value
+                del value['__force_dict__']
+                self.__dict__[key] = ConfigDict(value)
             else:
                 self.__dict__[key] = Config(value)
         elif isinstance(value, str) and ConfigString.contains_formatting(value):
@@ -99,7 +102,6 @@ class Config(object):
         return self
 
 
-
 def conf_from_module(module):
     if isinstance(module, str):
         module = import_module(module)
@@ -108,6 +110,7 @@ def conf_from_module(module):
 
     return conf_from_dict(module_dict)
 
+
 def conf_from_file(filepath):
     abspath = os.path.abspath(os.path.expanduser(filepath))
     conf_dict = {}
@@ -117,6 +120,7 @@ def conf_from_file(filepath):
 
     return conf_from_dict(conf_dict)
 
+
 def conf_from_dict(conf_dict):
     conf = Config()
 
@@ -138,6 +142,7 @@ def conf_from_dict(conf_dict):
     conf()
     return conf
 
+
 def import_module(conf):
     if conf.endswith('.py'):
         conf = conf[:-3]
@@ -164,17 +169,20 @@ def import_module(conf):
 
     return conf_mod
 
+
 def initconf():
     import default_config
     conf = conf_from_module(default_config)
     conf()
     return conf
 
+
 def set_config(name):
     if '/' in name:
         _runtime_conf.update(conf_from_file(name))
     else:
         _runtime_conf.update_with_module(name)
 
+
 _runtime_conf = initconf()
 

tests/test_conf.py

@@ -33,7 +33,6 @@ class TestConf(TestCase):
         self.assertEqual(conf.server.host, '1.1.1.1')
         self.assertEqual(conf.server.port, '8081')
 
-
     def test_update_set_default_config(self):
         """Update an empty configuration with the default values"""
 
@@ -50,7 +49,6 @@ class TestConf(TestCase):
         
     def test_update_force_dict(self):
         """Update an empty configuration with the default values"""
-
         conf = configuration.initconf()
         conf.update_with_module('forcedict')
 
@@ -62,11 +60,11 @@ class TestConf(TestCase):
         self.assertEqual(conf.server.host, '0.0.0.0')
         self.assertEqual(conf.server.port, '8080')
 
-        self.assertEqual(type(conf.beaker), dict)
+        self.assertTrue(isinstance(conf.beaker, dict))
         self.assertEqual(conf.beaker['session.key'], 'key')
         self.assertEqual(conf.beaker['session.type'], 'cookie')
         self.assertEqual(conf.beaker['session.validate_key'], '1a971a7df182df3e1dec0af7c6913ec7')
-        self.assertTrue(conf.beaker.get('__force_dict__'), None)
+        self.assertEqual(conf.beaker.get('__force_dict__'), None)
 
     def test_update_config_fail_bad_attribute(self):
         conf = configuration.initconf()
@@ -124,6 +122,9 @@ class TestConf(TestCase):
         configuration.set_config('config')
         self.assertEqual(_runtime_conf.server.host, '1.1.1.1')
 
+    def test_config_set_from_module_with_extension(self):
+        configuration.set_config('config.py')
+        self.assertEqual(_runtime_conf.server.host, '1.1.1.1')
 
     def test_config_string(self):
         s = '{pecan.conf.app}'