mailgw can override the MAIL_DEFUALT_CLASS

Author: Richard Jones

CHANGES.txt

@@ -10,6 +10,7 @@ Fixed:
 - less specific messages for login failures (thanks Chris Withers)
 - Reject raised against email messages should result in email rejection, not
   discarding of the message
+- mailgw can override the MAIL_DEFUALT_CLASS
 
 
 2004-07-21 0.7.6

roundup/mailgw.py

@@ -74,7 +74,7 @@ class node. Any parts of other types are each stored in separate files
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception. 
 
-$Id: mailgw.py,v 1.149.2.1 2004-09-07 10:37:52 richard Exp $
+$Id: mailgw.py,v 1.149.2.2 2004-09-14 22:03:42 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -311,10 +311,15 @@ class MailGW:
         (\[(?P<args>.+?)\])?                          # [prop=value]
         ''', re.IGNORECASE|re.VERBOSE)
 
-    def __init__(self, instance, db, arguments={}):
+    def __init__(self, instance, db, arguments=()):
         self.instance = instance
         self.db = db
         self.arguments = arguments
+        self.default_class = None
+        for option, value in self.arguments:
+            if option == '-c':
+                self.default_class = value.strip()
+
         self.mailer = Mailer(instance.config)
 
         # should we trap exceptions (normal usage) or pass them through
@@ -633,6 +638,8 @@ def handle_message(self, message):
                     sendto = [from_list[0][1]]
                     self.mailer.standard_message(sendto, subject, '') 
                     return
+                elif self.default_class:
+                    classname = self.default_class
                 elif hasattr(self.instance.config, 'MAIL_DEFAULT_CLASS') and \
                          self.instance.config.MAIL_DEFAULT_CLASS:
                     classname = self.instance.config.MAIL_DEFAULT_CLASS

roundup/scripts/roundup_mailgw.py

@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup_mailgw.py,v 1.15.2.1 2004-05-28 01:03:53 richard Exp $
+# $Id: roundup_mailgw.py,v 1.15.2.2 2004-09-14 22:03:43 richard Exp $
 
 """Command-line script stub that calls the roundup.mailgw.
 """
@@ -32,11 +32,12 @@
 def usage(args, message=None):
     if message is not None:
         print message
-    print _('Usage: %(program)s [-v] [[-C class] -S field=value]* <instance '
-        'home> [method]')%{'program': args[0]}
+    print _('Usage: %(program)s [-v] [-c] [[-C class] -S field=value]* '
+        '<instance home> [method]')%{'program': args[0]}
     print _('''
 Options:
  -v: print version and exit
+ -c: default class of item to create (else the tracker's MAIL_DEFAULT_CLASS)
  -C / -S: see below
 
 The roundup mail gateway may be called in one of four ways:
@@ -103,7 +104,7 @@ def main(argv):
     # take the argv array and parse it leaving the non-option
     # arguments in the args array.
     try:
-        optionsList, args = getopt.getopt(argv[1:], 'vC:S:', ['set=',
+        optionsList, args = getopt.getopt(argv[1:], 'vc:C:S:', ['set=',
             'class='])
     except getopt.GetoptError:
         # print help information and exit: