[Nym3-commit] r250 - trunk/nym3/Client

[laurent at conuropsis.org]

Author: laurent
Date: 2005-05-07 16:52:00 +0200 (Sat, 07 May 2005)
New Revision: 250

Modified:
   trunk/nym3/Client/Main.py
Log:
Remove dead code.


Modified: trunk/nym3/Client/Main.py
===================================================================
--- trunk/nym3/Client/Main.py	2005-05-07 13:29:08 UTC (rev 249)
+++ trunk/nym3/Client/Main.py	2005-05-07 14:52:00 UTC (rev 250)
@@ -604,81 +604,3 @@
 if __name__ == '__main__':
     main(sys.argv)
     sys.exit(0)
-
-    #the one when we determine the user account
-    nymUser = None
-    
-    #TODO put here options common to every command
-    parser.add_option("-d", "--debug", action = "", 
-		      callback = setDebug, help = "output message on stdout "
-		      "instead of sending them through mixminion")
-    userOption = make_option("-u", "--user", action = "callback", 
-			     callback = setUser, type = "string",
-			     help = "determine the user account to be used")
-    if len(sys.argv) < 2:
-	print "Usage: nymclient <command> [arguments]"
-	sys.exit(1)
-    if sys.argv[1] == 'setup':
-        parser.usage = "%prog setup [options] server nym1 [nym2 [...]]"
-        parser.add_option("-t", "--tag", dest = "tag", default = "", 
-	    help = "the tag that the user wish to associate with "
-	    "the new account")
-        parser.add_option("-a", "--address", dest = "address", default = "", 
-	    help = "the address to which the surbs point")
-        (options, args) = parser.parse_args(sys.argv[2:])
-	if len(args) < 1:
-	    parser.print_help()
-	    sys.exit(1)
-        nymUser = User.User(tag = options.tag, create = 1)
-        nymUser.setAddress(options.address)
-        nymUser.generateKeys()
-        nymUser.setServer(args[0])
-        surbs = nymUser.generateSurbs(3)
-	surbs = string.join(surbs, '')
-        comC = Message.Create()
-        comC.fromData(args[1:])
-        comN = Message.Newpk()
-        comN.fromData(_cr.pk_get_modulus(nymUser.data["idKey"]), 
-		      _cr.pk_get_modulus(nymUser.data["encKey"]))
-        comS = Message.Surb()
-        comS.fromData(surbs)
-        nymUser.sendControl([comC, comN, comS])
-        
-    #if sys.argv[1] == 'control': #handling of fragments (pipe to mixminion ...
-    #    pass
-    if sys.argv[1] == 'send-surb':
-        parser.usage = "%prog send-surb [options]"
-        parser.add_option(userOption)
-        (options, args) = myParseArgs(parser, sys.argv[2:])
-    if sys.argv[1] == 'change-key':
-        parser.usage = "%prog change-key [options]"
-        parser.add_option(userOption)
-        (options, args) = myParseArgs(parser, sys.argv[2:])
-    if sys.argv[1] == 'relay':
-        parser.usage = "%prog relay [options]"
-        parser.add_option(userOption)
-        (options, args) = myParseArgs(parser, sys.argv[2:])
-    if sys.argv[1] == 'get':
-        parser.usage = "%prog get MsgIdx1 [MsgIdx2 [...]]"
-        parser.add_option(userOption)
-        (options, args) = myParseArgs(parser, sys.argv[2:])
-        #convert the idx given as arguments to mid and send
-    if sys.argv[1] == 'summarize':
-        parser.usage = "%prog summarize [options]"
-        parser.add_option(userOption)
-        (options, args) = myParseArgs(parser, sys.argv[2:])
-    if sys.argv[1] == 'delete':
-        parser.usage = "%prog delete MsgIdx1 [MsgIdx2 [...]]"
-        parser.add_option(userOption)
-        (options, args) = myParseArgs(parser, sys.argv[2:])
-        #convert the idx given as arguments to mid and send
-    if sys.argv[1] == 'policy':
-        parser.usage = "%prog policy [options]"
-        parser.add_option(userOption)
-        (options, args) = myParseArgs(parser, sys.argv[2:])
-    if sys.argv[1] == 'tag':
-        parser.usage = "%prog tag [options] idTag tag"
-        (options, args) = myParseArgs(parser, sys.argv[2:])
-        T = User.Tag()
-        T.store(tag, idTag)
-