debug angepasst und konsequenter gemacht

Userconfig/cfgfile.py

@@ -12,11 +12,13 @@ Copyright (c) 2013 __MyCompanyName__. All rights reserved.
 """
 import ConfigParser
 import os
+import re
 
 class Conf(object):
   confobj = ConfigParser.RawConfigParser()
   cfgfile = ''
-
+  debug = None
+  
   def __init__(self, filename = None):
     """if filename is set, open config file and initialize the ConfigParser
     """
@@ -25,7 +27,12 @@ class Conf(object):
       self.setfilename(filename)
     # if filename
   # def __init__
-
+  
+  def setdebug(self, debug):
+    """docstring for setdebug"""
+    self.debug = debug
+  # def setdebug
+  
   def setfilename(self, filename):
     """initialize the ConfigParser
     """
@@ -34,9 +41,28 @@ class Conf(object):
       raise Exception('Cannot read config file ' + filename)
     # if cannot read
     self.cfgfile = filename
-    
-    configdir=self.get("Main","configdir").replace("$HOME",os.environ['HOME'])
-    self.confobj.set("Main","configdir",configdir)
+    if self.debug:
+      self.debug.debug("Read config file %s" % filename, 2)
+      self.debug.debug("Replacing environment variables in %s." % filename, 3)
+    # if debug
+
+    for s in self.confobj.sections():
+      for (i, val) in self.confobj.items(s):
+        tempre = re.search("\$([A-Z]+)[^A-Z]*", val)
+        if tempre:
+          varname = tempre.group(1)
+          if self.debug:
+            self.debug.debug("Found variable %s in %s." % (varname, i), 3)
+          # if debug
+          if os.environ.has_key(varname):
+            if self.debug:
+              self.debug.debug("%s exists in environment, replacing with %s." % (varname, os.environ[varname]))
+            # if debug
+            self.set(s, i, val.replace("$"+varname, os.environ[varname]))
+          # if has_key
+        # if tempre
+      # for i
+    # for s
   # def setfilename
 
   def get(self, section, option):