too bad, long nights, all good (nearly)

lib/config/hostgroups.py

@@ -57,7 +57,7 @@ class HostGroup(object):
             l.extend(item)
         else:
             l.append(item)
-    
+
     def add_members(self, member):
         self.__add_internal(self.get_members(), member)
             
@@ -80,11 +80,8 @@ class HostGroup(object):
         return self.processors
     
     def get_services(self):
-        s = self.__services
-        if not isinstance(s, list):
-            s = self.__dict__["_HostGroup__services"]
-        return s
-    
+        return self.__services
+
     def get_hosts(self):
         return self.hosts
     

lib/config/layouts.py

@@ -6,7 +6,7 @@ class LayoutException(Exception):
         return repr(self.msg)
 
 
-class Layout:
+class Layout(object):
     def __init__(self, name, enabled=False, hostgroups=None):
         self._name = name
         self._enabled = enabled

lib/config/parser.py

@@ -10,7 +10,6 @@ from members import Member
 from periods import CronPeriod, DatePeriod, IntervalPeriod
 
 from lib.services.service import Service
-#print id(Service)
 from lib.processors.processor import Processor
 from lib.parsers.parser import Parser
 from lib.tasks.task import  Task

lib/core/job.py

@@ -3,7 +3,7 @@ This is what job_function needs as parameter for each job to successfully
 execute.
 """
 
-from command import Command
+from lib.core.command import Command
 
 
 def generateId():