some more cleanups

linspector/config/hostgroups.py

@@ -61,11 +61,6 @@ class HostGroup(object):
         if tmp in kwargs:
             self.add_parents(kwargs[tmp])
 
-        tmp = "processors"
-        self.processors = []
-        if tmp in kwargs:
-            self.add_processors(kwargs[tmp])
-
     def __str__(self):
         return self.name
 
@@ -91,9 +86,6 @@ class HostGroup(object):
     def add_hosts(self, host):
         self.__add_internal(self.get_hosts(), host)
          
-    def add_processors(self, processor):
-        self.__add_internal(self.get_processors(), processor)
-         
     def add_parents(self, parent):
         self.__add_internal(self.get_parents(), parent)
 
@@ -103,9 +95,6 @@ class HostGroup(object):
     def get_parents(self):
         return self.parents
     
-    def get_processors(self):
-        return self.processors
-    
     def get_services(self):
         return self.__services
 

linspector/config/members.py

@@ -17,8 +17,6 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
-import re
-
 from logging import getLogger
 
 logger = getLogger(__name__)
@@ -41,7 +39,7 @@ class Member:
     def __init__(self, name="", **kwargs):
         self.name = name
         tmp = "tasks"
-        self.__tasks = []
+        self.tasks = []
         if not tmp in kwargs:
             raise MemberMissingArgumentException(tmp, name)
         self.add_tasks(kwargs[tmp])
@@ -59,7 +57,7 @@ class Member:
         return self.__tasks
 
     def __str__(self):
-        ret = "Member Id: " + self.nameid + " Name: " + self.name + " Filters: " + str(self.phone)
-        for f in self.filters:
-            ret += str(f)
+        ret = "Member: " + self.name + " Tasks: "
+        for t in self.tasks:
+            ret += str(t)
         return ret