Changes from review

mailgw script was still using usage()

Author: schlatterbeck

roundup/scripts/roundup_mailgw.py

@@ -230,7 +230,8 @@ def main(argv):
             password = match.group('pass')
             server = match.group('server')
         else:
-            return usage(argv, _('Error: %s specification not valid') % source)
+            cmd.print_help(sys.stderr)
+            return _('\nError: %s specification not valid') % source
 
     # now invoke the mailgw handler depending on the server handler requested
     if source.startswith('pop'):
@@ -253,9 +254,10 @@ def main(argv):
             mailbox = args.args[3]
         return handler.do_imap(server, username, password, mailbox, **d)
 
-    return usage(argv, _('Error: The source must be either "mailbox",'
-                         ' "pop", "pops", "apop", "imap", "imaps" or'
-                         ' "imaps_cram'))
+    cmd.print_help(sys.stderr)
+    return _('\nError: The source must be either "mailbox",'
+             ' "pop", "pops", "apop", "imap", "imaps", '
+             ' "imaps_cram", or "imaps_oauth"')
 
 
 def run():

test/test_mailgw.py

@@ -243,7 +243,7 @@ def _allowAnonymousSubmit(self):
         ]
         self.db.security.role['anonymous'].permissions = p
 
-    def _create_mailgw(self, message, args=[]):
+    def _create_mailgw(self, message, args=()):
         class MailGW(self.instance.MailGW):
             """call _handle_message as handle_message 
                the real handle_message reopens the database, and destroys
@@ -256,7 +256,7 @@ def handle_message(self, message):
         handler.db = self.db
         return handler
 
-    def _handle_mail(self, message, args=[], trap_exc=0):
+    def _handle_mail(self, message, args=(), trap_exc=0):
         handler = self._create_mailgw(message, args)
         handler.trapExceptions = trap_exc
         return handler.main(io.BytesIO(s2b(message)))