*** empty log message ***

Author: Richard Jones

roundup/mailgw.py

@@ -73,7 +73,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.112 2003-03-24 02:51:21 richard Exp $
+$Id: mailgw.py,v 1.113 2003-03-24 02:54:35 richard Exp $
 '''
 
 import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri
@@ -219,7 +219,7 @@ def do_mailbox(self, filename):
     def do_apop(self, server, user='', password=''):
         ''' Do authentication POP
         '''
-        self.do_pop(server, user, password, apop=1):
+        self.do_pop(server, user, password, apop=1)
 
     def do_pop(self, server, user='', password='', apop=0):
         '''Read a series of messages from the specified POP server.

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.8 2003-03-24 02:51:22 richard Exp $
+# $Id: roundup_mailgw.py,v 1.9 2003-03-24 02:56:30 richard Exp $
 
 # python version check
 from roundup import version_check
@@ -69,7 +69,8 @@ def usage(args, message=None):
  not supplied on the command-line.
 
 APOP:
- Same as POP, but using Authenticated POP
+ Same as POP, but using Authenticated POP:
+    apop username:password@server
 
 ''')
     return 1
@@ -122,8 +123,15 @@ def main(argv):
                 return handler.do_pop(m.group('server'), m.group('user'),
                     m.group('pass'))
             return usage(argv, _('Error: pop specification not valid'))
+        elif source == 'apop':
+            m = re.match(r'((?P<user>[^:]+)(:(?P<pass>.+))?@)?(?P<server>.+)',
+                specification)
+            if m:
+                return handler.do_apop(m.group('server'), m.group('user'),
+                    m.group('pass'))
+            return usage(argv, _('Error: apop specification not valid'))
 
-        return usage(argv, _('Error: The source must be either "mailbox" or "pop"'))
+        return usage(argv, _('Error: The source must be either "mailbox", "pop" or "apop"'))
     finally:
         db.close()