revert getKey change..

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index c06d3b7298e1c0f48588d2d17435f2c6a589700b..06bb62a2d14e134e41e7b91932b55018d1730f48 100644 (file)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -27,11 +27,9 @@ class configFile:
                x = line.find("=")
                if x > -1:
                        self.configElements[line[:x]] = line[x + 1:-1]
                x = line.find("=")
                if x > -1:
                        self.configElements[line[:x]] = line[x + 1:-1]

-       
+

        def getKey(self, key):
        def getKey(self, key):

-               if self.configElements.has_key(key):
-                       return self.configElements[key]
-               return None
+               return self.configElements[key]

 
        def setKey(self, key, value, isDefaultKey=False):
                self.changed = 1
 
        def setKey(self, key, value, isDefaultKey=False):
                self.changed = 1


@@ -558,7 +556,10 @@ class configElement:
                if self.value != defaultValue or self.saveDefaults:
                        configfile.setKey(self.configPath, self.datatoFile(self.controlType, self.value))
                else:
                if self.value != defaultValue or self.saveDefaults:
                        configfile.setKey(self.configPath, self.datatoFile(self.controlType, self.value))
                else:

-                       oldValue = configfile.getKey(self.configPath)
+                       try:
+                               oldValue = configfile.getKey(self.configPath)
+                       except:
+                               oldValue = None

                        if oldValue is not None and oldValue != defaultValue:
                                configfile.setKey(self.configPath, self.datatoFile(self.controlType, self.value), True)
 
                        if oldValue is not None and oldValue != defaultValue:
                                configfile.setKey(self.configPath, self.datatoFile(self.controlType, self.value), True)