Changeset 206

Timestamp:

05/29/08 22:43:39 (15 years ago)

Author:

bas

Message:

email2trac.py.in:

• moved dry_run to config dictionary
• fixed an error must use self.parameter instead of settings
• made a start with black_list option

Location:

trunk

Files:

• email2trac.conf (modified) (1 diff)
• email2trac.py.in (modified) (8 diffs)

trunk/email2trac.conf

@@ -17 +17 @@
 strip_quotes: 0
 ignore_trac_user_settings: 0
+black_list : basv@sara.nl 
 
 

trunk/email2trac.py.in

@@ -131 +131 @@
         comment = '> '
     
-        def __init__(self, env, parameters, version, dry_run):
+        def __init__(self, env, parameters, version):
                 self.env = env
 
@@ -137 +137 @@
                 #
                 self.db = None
+
+                # Save parameters
+                #
+                self.parameters = parameters
 
                 # Some useful mail constants
@@ -145 +149 @@
 
                 self.VERSION = version
-                self.DRY_RUN = dry_run
+                self.DRY_RUN = parameters['dry_run']
 
                 self.get_config = self.env.config.get
@@ -272 +276 @@
 
         def blacklisted_from(self):
+                """
+                This function wil check if the email address is in the black list
+                """
+                try:
+                        black_list = self.parameters['black_list']
+                except KeyError, detail:
+                        black_list = 'MAILER-DAEMON@'
+
+                #print black_list
+
                 FROM_RE = re.compile(r"""
                     MAILER-DAEMON@
@@ -631 +645 @@
                                 print 'trac.ini name %s = %s' %(name, value)
 
-                        prefix = settings['ticket_prefix']
+                        prefix = self.parameters['ticket_prefix']
                         try:
-                                value = settings['%s_%s' %(prefix, name)]
+                                value = self.parameters['%s_%s' %(prefix, name)]
                                 if self.DEBUG > 10:
                                         print 'email2trac.conf %s = %s ' %(name, value)
@@ -675 +689 @@
                         tkt['component'] = 'Spam'
 
-                elif settings.has_key('component'):
-                        tkt['component'] = settings['component']
+                elif self.parameters.has_key('component'):
+                        tkt['component'] = self.parameters['component']
 
                 if not msg['Subject']:
@@ -1149 +1163 @@
         #
         settings['ticket_prefix'] = ticket_prefix
+        settings['dry_run'] = dry_run
         
         if settings.has_key('trac_version'):
@@ -1200 +1215 @@
 
                 env = Environment(settings['project'], create=0)
-                tktparser = TicketEmailParser(env, settings, float(version), dry_run)
+                tktparser = TicketEmailParser(env, settings, float(version))
                 tktparser.parse(sys.stdin)