ppf/new: Initialize 'data' field in constructor for config.py classes. Remove super...

diff --git a/ppf/new/config.py b/ppf/new/config.py
index 062585f..5e08598 100644 (file)
--- a/ppf/new/config.py
+++ b/ppf/new/config.py
@@ -36,7 +36,7 @@ logger.addHandler(ch)
 
 class SwarmDescription(object):
     def __init__(self):
-        super(SwarmDescription, self).__init__()
+        self.data = ConfigParser.ConfigParser()
 
     def load(self, swarm_config_file):
         """ Load configuration file and use ConfigParser.
@@ -50,7 +50,6 @@ class SwarmDescription(object):
             logger.error("No such file: %s" %swarm_config_file)
         text = ''.join(text.split('\t'))
         f = StringIO("[%s]\n" % NOSECTION + text)
-        self.data = ConfigParser.ConfigParser()
         self.data.readfp(f)
 
     def store(self, ini_file):
@@ -73,9 +72,7 @@ class SwarmDescription(object):
         session_names.remove('swarm')
         session_list = []
         for session in session_names:
-            entry = SessionEntry()
-            entry.data = ConfigParser.ConfigParser()
-            entry.data.add_section(session)
+            entry = SessionEntry(session)
             session_items = dict(self.data.items(session))
             for key in session_items:
                 entry.data.set(session, key, session_items[key])
@@ -88,7 +85,6 @@ class SwarmDescription(object):
         self.data.set(session_name, 'client_session_id', str(cs_id))
         session_entry.data.set(session_name, 'client_session_id', str(cs_id))
 
-
     def get_file_archives(self):
         """ Return a list containing all archives from swarm. """
         archives = []
@@ -100,9 +96,9 @@ class SwarmDescription(object):
         return archives
 
 class SessionEntry(object):
-    def __init__(self):
-        super(SessionEntry, self).__init__()
-
+    def __init__(self, session):
+        self.data = ConfigParser.ConfigParser()
+        self.data.add_section(session)
 
     def get_session(self):
         """ Return name of the session. """
@@ -140,7 +136,7 @@ class SessionEntry(object):
 
 class AccessConfig(object):
     def __init__(self):
-        super(AccessConfig, self).__init__()
+        self.data = ConfigParser.ConfigParser()
 
     def load(self, access_config_file):
         """ Load configuration file and use ConfigParser. """
@@ -150,7 +146,6 @@ class AccessConfig(object):
             logger.error("No such file: %s" %swarm_config_file)
         text = ''.join(text.split('\t'))
         f = StringIO(text)
-        self.data = ConfigParser.ConfigParser()
         self.data.readfp(f)
 
     def store(self, ini_file):

diff --git a/ppf/new/tests/test_config.py b/ppf/new/tests/test_config.py
index 390636a..073e44b 100644 (file)
--- a/ppf/new/tests/test_config.py
+++ b/ppf/new/tests/test_config.py
@@ -173,7 +173,6 @@ class SessionEntryTest(unittest.TestCase):
         self.sd.load(config_file_path)
         session_entries = self.sd.get_session_entries()
 
-        self.se = config.SessionEntry()
         self.se = session_entries[2]
 
     def test_get_session(self):