[minion-cvs] Make output and messages saner; fix drop support

[nickm@seul.org (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria.mit.edu:/tmp/cvs-serv3390/lib/mixminion

Modified Files:
	Main.py test.py 
Log Message:
Make output and messages saner; fix drop support

Index: Main.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/Main.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Main.py	6 Jan 2003 03:29:46 -0000	1.21
+++ Main.py	6 Jan 2003 10:39:24 -0000	1.22
@@ -126,7 +126,7 @@
 }
 
 _USAGE = (
-  "Usage: %s <command> [arguments]\n"+
+  "Usage: mixminion <command> [arguments]\n"+
   "where <command> is one of:\n"+
   "                              (For Everyone)\n"+
   "       version        [Print the version of Mixminion and exit]\n"+
@@ -140,7 +140,9 @@
   "                             (For Developers)\n"+
   "       dir            [Administration for server directories]\n"+
   "       unittests      [Run the mixminion unit tests]\n"+
-  "       benchmarks     [Time underlying cryptographic operations]\n"
+  "       benchmarks     [Time underlying cryptographic operations]\n"+
+  "\n"+
+  "For help on sending a message, run 'mixminion send --help'"
 )
 
 def printVersion(cmd,args):
@@ -160,7 +162,7 @@
     # Check whether we have a recognized command.
     if len(args) == 1 or not _COMMANDS.has_key(args[1]):
         printVersion(args[0],args[1:])
-        print _USAGE % args[0]
+        print _USAGE
         sys.exit(1)
 
     # Read the module and function.

Index: test.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/test.py,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- test.py	6 Jan 2003 07:03:24 -0000	1.67
+++ test.py	6 Jan 2003 10:39:24 -0000	1.68
@@ -4808,7 +4808,7 @@
         parseEq("foo@bar.com", SMTP_TYPE, "foo@bar.com", None)
         ##
         # Check other address formats.
-        parseEq("drop", DROP_TYPE, None, None)
+        parseEq("drop", DROP_TYPE, "", None)
         parseEq("test:foobar", 0xFFFE, "foobar", None)
         parseEq("test", 0xFFFE, "", None)
         parseEq("0x999:zymurgy", 0x999, "zymurgy", None)