revert some changes

diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index 1c8e09031b4433994f68fd0e0b4cbf4e0c16e4e7..68fd0f749fc15e010fd49b1ece1500cdcfdb722a 100755 (executable)
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -26,7 +26,7 @@ from time import localtime, strftime
 #            the default if saved_value is 'None' (default)
 #            or invalid.
 #
 #            the default if saved_value is 'None' (default)
 #            or invalid.
 #

-class ConfigElement:
+class ConfigElement(object):

        def __init__(self):
                self.saved_value = None
                self.last_value = None
        def __init__(self):
                self.saved_value = None
                self.last_value = None


@@ -154,7 +154,7 @@ def getKeyNumber(key):
        assert key in KEY_NUMBERS
        return key - KEY_0
 
        assert key in KEY_NUMBERS
        return key - KEY_0
 

-class choicesList: # XXX: we might want a better name for this
+class choicesList(object): # XXX: we might want a better name for this

        LIST_TYPE_LIST = 1
        LIST_TYPE_DICT = 2
 
        LIST_TYPE_LIST = 1
        LIST_TYPE_DICT = 2
 


@@ -999,7 +999,7 @@ class ConfigPassword(ConfigText):
                if self.hidden:
                        text = len(text) * self.censor_char
                return (mtext, text, mark)
                if self.hidden:
                        text = len(text) * self.censor_char
                return (mtext, text, mark)

-                       
+

        def onSelect(self, session):
                ConfigText.onSelect(self, session)
                self.hidden = False
        def onSelect(self, session):
                ConfigText.onSelect(self, session)
                self.hidden = False


@@ -1382,7 +1382,7 @@ class ConfigNothing(ConfigSelection):
 # config.saved_value == {"foo": {"bar": "True"}, "foobar": "False"}
 #
 
 # config.saved_value == {"foo": {"bar": "True"}, "foobar": "False"}
 #
 

-class ConfigSubsectionContent:
+class ConfigSubsectionContent(object):

        pass
 
 # we store a backup of the loaded configuration
        pass
 
 # we store a backup of the loaded configuration


@@ -1395,7 +1395,7 @@ class ConfigSubsectionContent:
 # config.dipswitches.append(ConfigYesNo())
 # config.dipswitches.append(ConfigYesNo())
 # config.dipswitches.append(ConfigYesNo())
 # config.dipswitches.append(ConfigYesNo())
 # config.dipswitches.append(ConfigYesNo())
 # config.dipswitches.append(ConfigYesNo())

-class ConfigSubList(list):
+class ConfigSubList(list, object):

        def __init__(self):
                list.__init__(self)
                self.stored_values = {}
        def __init__(self):
                list.__init__(self)
                self.stored_values = {}


@@ -1438,7 +1438,7 @@ class ConfigSubList(list):
 # care must be taken that the 'key' has a proper
 # str() method, because it will be used in the config
 # file.
 # care must be taken that the 'key' has a proper
 # str() method, because it will be used in the config
 # file.

-class ConfigSubDict(dict):
+class ConfigSubDict(dict, object):

        def __init__(self):
                dict.__init__(self)
                self.stored_values = {}
        def __init__(self):
                dict.__init__(self)
                self.stored_values = {}


@@ -1487,7 +1487,7 @@ class ConfigSubDict(dict):
 # __setattr__.
 # If you don't understand this, try adding
 # __setattr__ to a usual exisiting class and you will.
 # __setattr__.
 # If you don't understand this, try adding
 # __setattr__ to a usual exisiting class and you will.

-class ConfigSubsection:
+class ConfigSubsection(object):

        def __init__(self):
                self.__dict__["content"] = ConfigSubsectionContent()
                self.content.items = { }
        def __init__(self):
                self.__dict__["content"] = ConfigSubsectionContent()
                self.content.items = { }