Merged the new ConfDict and the old ConfigDict into one class.

Added depr() warnings to all old ConfigDict APIs.
Added ConfigDict.load_dict()

1 files changed, 14 insertions, 6 deletions

diff --git a/test/test_config.py b/test/test_config.py
index b8f94e3..b16ddc5 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -1,9 +1,9 @@
 import unittest
-from bottle import ConfDict
+from bottle import ConfigDict
 
 class TestConfDict(unittest.TestCase):
     def test_write(self):
-        c = ConfDict()
+        c = ConfigDict()
         c['key'] = 'value'
         self.assertEqual(c['key'], 'value')
         self.assertTrue('key' in c)
@@ -11,27 +11,35 @@ class TestConfDict(unittest.TestCase):
         self.assertEqual(c['key'], 'value2')
 
     def test_update(self):
-        c = ConfDict()
+        c = ConfigDict()
         c['key'] = 'value'
         c.update(key='value2', key2='value3')
         self.assertEqual(c['key'], 'value2')
         self.assertEqual(c['key2'], 'value3')
 
     def test_namespaces(self):
-        c = ConfDict()
+        c = ConfigDict()
         c.update('a.b', key='value')
         self.assertEqual(c['a.b.key'], 'value')
         self.assertEqual(c['a.b.key'], 'value')
 
     def test_meta(self):
-        c = ConfDict()
+        c = ConfigDict()
         c.meta_set('bool', 'filter', bool)
         c.meta_set('int', 'filter', int)
         c['bool'] = 'I am so true!'
         c['int']  = '6'
         self.assertTrue(c['bool'] is True)
-        self.assertEquals(c['int'], 6)        
+        self.assertEquals(c['int'], 6)
         self.assertRaises(ValueError, lambda: c.update(int='not an int'))
+
+    def test_load_dict(self):
+        c = ConfigDict()
+        d = dict(a=dict(b=dict(foo=5, bar=6), baz=7))
+        c.load_dict(d)
+        self.assertEquals(c['a.b.foo'], 5)
+        self.assertEquals(c['a.b.bar'], 6)
+        self.assertEquals(c['a.baz'], 7)
    
 if __name__ == '__main__': #pragma: no cover
     unittest.main()