From 8068ef656fcca9c6ac093b0e0ace1c20f5a7bc68 Mon Sep 17 00:00:00 2001
From: Chris Jones <cmsj@tenshu.net>
Date: Wed, 23 Dec 2009 00:10:57 +0000
Subject: [PATCH] extend testing, make ConfigBase settable, drop ConfigBase
 derivation from dict

---
 terminatorlib/config.py | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/terminatorlib/config.py b/terminatorlib/config.py
index b40af7cc..3177ad7c 100755
--- a/terminatorlib/config.py
+++ b/terminatorlib/config.py
@@ -23,6 +23,8 @@ Classes relating to configuration
 >>> config['focus']
 'click'
 >>> config['focus'] = 'sloppy'
+>>> config['focus']
+'sloppy'
 >>>
 
 """
@@ -175,7 +177,15 @@ class Config(object):
         """Look up a configuration item"""
         return(self.base.get_item(key, self.profile))
 
-class ConfigBase(Borg, dict):
+    def __setitem__(self, key, value):
+        """Set a particular configuration item"""
+        return(self.base.set_item(key, value, self.profile))
+
+    def set_profile(self, profile):
+        """Set our profile (which usually means change it)"""
+        self.profile = profile
+
+class ConfigBase(Borg):
     """Class to provide access to our user configuration"""
     global_config = None
     profiles = None
@@ -186,7 +196,6 @@ class ConfigBase(Borg, dict):
         """Class initialiser"""
 
         Borg.__init__(self, self.__class__.__name__)
-        dict.__init__(self)
 
         self.prepare_attributes()
         self.load_config()
@@ -216,7 +225,7 @@ class ConfigBase(Borg, dict):
             dbg('ConfigBase::get_item: found in globals: %s' %
                     self.global_config[key])
             return(self.global_config[key])
-        elif self.profiles['default'].has_key(key):
+        elif self.profiles[profile].has_key(key):
             dbg('ConfigBase::get_item: found in profile: %s' %
                     self.profiles[profile][key])
             return(self.profiles[profile][key])
@@ -229,6 +238,24 @@ class ConfigBase(Borg, dict):
         else:
             raise KeyError('ConfigBase::get_item: unknown key %s' % key)
 
+    def set_item(self, key, value, profile='default', plugin=None):
+        """Set a configuration item"""
+        dbg('ConfigBase::set_item: Setting %s=%s (profile=%s, plugin=%s)' %
+                (key, value, profile, plugin))
+
+        if self.global_config.has_key(key):
+            self.global_config[key] = value
+        elif self.profiles[profile].has_key(key):
+            self.profiles[profile] = value
+        elif key == 'keybindings':
+            self.keybindings = value
+        elif plugin is not None and self.plugins[plugin].has_key(key):
+            self.plugins[plugin][key] = value
+        else:
+            raise KeyError('ConfigBase::set_item: unknown key %s' % key)
+
+        return(True)
+
 if __name__ == '__main__':
     import doctest
     (failed, attempted) = doctest.testmod()