fix set_attributes

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

diff --git a/sfa/util/config.py b/sfa/util/config.py
index 9caa767..444ceeb 100644 (file)
--- a/sfa/util/config.py
+++ b/sfa/util/config.py
@@ -12,6 +12,12 @@ 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,6 +113,10 @@ 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)
         
@@ -133,7 +141,7 @@ DO NOT EDIT. This file was automatically generated at
             c = ConfigParser.ConfigParser()
             c.read(config_file)
             return True
-        except:
+        except ConfigParser.MissingSectionHeaderError:
             return False
 
 
@@ -164,8 +172,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()