deeper pass on xmlrpclib vs xmlrpc.client as well as configparser

[sfa.git] / sfa / util / config.py

diff --git a/sfa/util/config.py b/sfa/util/config.py
index 9caa767..e5435a7 100644 (file)
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -2,16 +2,22 @@
 import sys
 import os
 import time
-import ConfigParser
 import tempfile
 import codecs
-from StringIO import StringIO
 from sfa.util.xml import XML
+from sfa.util.py23 import StringIO
+from sfa.util.py23 import ConfigParser
 
 default_config = \
 """
 """
 
+def isbool(v):
+    return v.lower() in ("true", "false")
+
+def str2bool(v):
+    return v.lower() in ("true", "1")             
+
 class Config:
   
     def __init__(self, config_file='/etc/sfa/sfa_config'):
@@ -47,12 +53,10 @@ DO NOT EDIT. This file was automatically generated at
         if filename:
             try:
                 self.config.read(filename)
-            except:
-                print "normal read failed" 
+            except ConfigParser.MissingSectionHeaderError:
                 if filename.endswith('.xml'):
                     self.load_xml(filename)
                 else:
-                    print "loading shell"
                     self.load_shell(filename)
             self._files.append(filename)
             self.set_attributes()
@@ -109,9 +113,62 @@ DO NOT EDIT. This file was automatically generated at
             for item in self.config.items(section):
                 name = "%s_%s" % (section, item[0])
                 value = item[1]
+                if isbool(value):
+                    value = str2bool(value)
+                elif value.isdigit():
+                    value = int(value)    
                 setattr(self, name, value)
                 setattr(self, name.upper(), value)
-        
+
+    def variables(self):
+        """
+        Return all variables.
+
+        Returns:
+
+        variables = { 'category_id': (category, variablelist) }
+
+        category = { 'id': "category_identifier",
+                     'name': "Category name",
+                     'description': "Category description" }
+
+        variablelist = { 'variable_id': variable }
+
+        variable = { 'id': "variable_identifier",
+                     'type': "variable_type",
+                     'value': "variable_value",
+                     'name': "Variable name",
+                     'description': "Variable description" }
+        """
+
+        variables = {}
+        for section in self.config.sections():
+            category = {
+                'id': section,
+                'name': section,
+                'description': section,
+            }
+            variable_list = {}
+            for item in self.config.items(section):
+                var_name = item[0] 
+                name = "%s_%s" % (section, var_name)
+                value = item[1]
+                if isbool(value):
+                    value_type = bool
+                elif value.isdigit():
+                    value_type = int
+                else:
+                    value_type = str
+                variable = {
+                    'id': var_name,
+                    'type': value_type,
+                    'value': value,
+                    'name': name,
+                    'description': name,
+                }
+                variable_list[name] = variable
+            variables[section] = (category, variable_list)
+        return variables      
 
     def verify(self, config1, config2, validate_method):
         return True
@@ -133,11 +190,12 @@ DO NOT EDIT. This file was automatically generated at
             c = ConfigParser.ConfigParser()
             c.read(config_file)
             return True
-        except:
+        except ConfigParser.MissingSectionHeaderError:
             return False
 
 
-    def dump(self, sections = []):
+    def dump(self, sections=None):
+        if sections is None: sections=[]
         sys.stdout.write(output_python())
 
     def output_python(self, encoding = "utf-8"):
@@ -164,8 +222,10 @@ DO NOT EDIT. This file was automatically generated at
                 # bash does not have the concept of NULL
                 if value:
                     option = "%s_%s" % (section.upper(), name.upper())
-                    if not value.isdigit() and not bool(value):
-                        value = "'%s'" % value  
+                    if isbool(value):
+                        value = str(str2bool(value))
+                    elif not value.isdigit():
+                        value = '"%s"' % value  
                     buf.write(option + "=" + value + os.linesep)
         return buf.getvalue()