Changeset 421 for trunk

Timestamp:

07/21/10 14:22:52 (14 years ago)

Author:

bas

Message:

ported self.SPAM_HEADER to new syntax self.parameters.spam_header

File:

• trunk/email2trac.py.in (modified) (3 diffs)

trunk/email2trac.py.in

@@ -199 +199 @@
                         self.MAILTO = 0
 
-                if self.parameters.has_key('spam_level'):
-                        self.SPAM_LEVEL = int(self.parameters['spam_level'])
+                if self.parameters.spam_level:
+                        self.SPAM_LEVEL = int(self.parameters.spam_level)
                 else:
                         self.SPAM_LEVEL = 0
 
-                if self.parameters.has_key('spam_header'):
-                        self.SPAM_HEADER = self.parameters['spam_header']
-                else:
-                        self.SPAM_HEADER = 'X-Spam-Score'
+                if not self.parameters.spam_header:
+                        self.parameters.spam_header = 'X-Spam-Score'
 
                 if self.parameters.has_key('email_quote'):
@@ -346 +344 @@
                 """
                 spam = False
-                if message.has_key(self.SPAM_HEADER):
-                        spam_l = string.split(message[self.SPAM_HEADER])
+                if message.has_key(self.parameters.spam_header):
+                        spam_l = string.split(message[self.parameters.spam_header])
 
                         try:
@@ -1537 +1535 @@
                         return False
 
-                # If drop the message
+                # If spam drop the message
                 #
                 if self.spam(m) == 'drop':