--- a/fixbot/logwatch/filters.py	Fri Feb 05 21:38:25 2010 +0200
+++ b/fixbot/logwatch/filters.py	Fri Feb 05 21:39:51 2010 +0200
@@ -6,10 +6,10 @@
     """
     
     # the LogWatchModule event to send
-    event_type = None
+    label = None
     
-    def __init__ (self, event_type) :
-        self.event_type = event_type
+    def __init__ (self, label) :
+        self.label = label
 
     def test (self, line) :
         """
@@ -23,8 +23,8 @@
             Match against the given SyslogMessage, and return one of:
                 None        - filter did not match, continue
                 False       - filter matched, line should be dropped
-                    (type, <str>)
-                            - filter matched, pass formatted output
+                    (label, <str>)
+                            - filter matched, pass formatted output with given label
         """
         
         # default to a full-line match
@@ -37,7 +37,7 @@
 
     def test (self, line) :
         # pass through
-        return self.event_type, line
+        return self.label, line
 
 class NullFilter (BaseFilter) :
     """
@@ -45,7 +45,7 @@
     """
     
     def __init__ (self, pattern, flags=0) :
-        # don't need an event_type
+        # don't need an label
 
         self.regexp = re.compile(pattern, flags)
     
@@ -62,8 +62,8 @@
         pattern, using the regexp match groups as parameters.
     """
 
-    def __init__ (self, event_type, pattern, format=None) :
-        super(SimpleFilter, self).__init__(event_type)
+    def __init__ (self, label, pattern, format=None) :
+        super(SimpleFilter, self).__init__(label)
         
         # store
         self.regexp = re.compile(pattern)
@@ -80,11 +80,11 @@
         # reformat?
         if self.format :
             # format with regexp match groups
-            return self.event_type, self.format % match.groupdict()
+            return self.label, self.format % match.groupdict()
         
         else :
             # match as-is
-            return self.event_type, line
+            return self.label, line
 
 class SyslogFilter (BaseFilter) :
     """