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

[jr at conuropsis.org]

Author: jr
Date: 2005-04-28 15:52:04 +0200 (Thu, 28 Apr 2005)
New Revision: 202

Modified:
   trunk/nym3/Client/Account.py
   trunk/nym3/Client/Main.py
Log:
cleaning of the messy commit


Modified: trunk/nym3/Client/Account.py
===================================================================
--- trunk/nym3/Client/Account.py	2005-04-28 13:36:32 UTC (rev 201)
+++ trunk/nym3/Client/Account.py	2005-04-28 13:52:04 UTC (rev 202)
@@ -51,8 +51,8 @@
     """Contains mapping between idTag and nickname"""
     def __init__(self, filename):
 	self.lock = None
-        self.id2nick = None
-        self.nick2id = None
+	self.id2nick = None
+	self.nick2id = None
 	self.filename = filename
 
     def __del__(self):
@@ -81,9 +81,7 @@
 	self.nick2id = {}
 	for i in self.id2nick.keys():
 	    self.nick2id[self.id2nick[i]] = i
-	print self.nick2id.keys()
-	print self.id2nick.keys()
-    
+
     def _loadifneeded(self):
 	if self.id2nick == None:
 	    self._lock()
@@ -180,7 +178,6 @@
 	    self.idKey = None
 	    self.pendingKey = None
 	else:
-	    print "nickname: %s" % nickname
 	    self.data_status = 'unloaded'
 	    self.journal_status = 'unloaded'
 	    self.mbox_status = 'unloaded'

Modified: trunk/nym3/Client/Main.py
===================================================================
--- trunk/nym3/Client/Main.py	2005-04-28 13:36:32 UTC (rev 201)
+++ trunk/nym3/Client/Main.py	2005-04-28 13:52:04 UTC (rev 202)
@@ -88,7 +88,7 @@
     sr = Message.StrReader(msg)
     comList = sr.readCommandCToSList()
     for com in comList:
-        if (com.ct() == SToCCODE['Created']):
+	if (com.ct() == SToCCODE['Created']):
 	    account = Account.Account(config, nickname)
 	    # No challenge/response scheme decided yet:
 	    account['handshake'] = 'completed'
@@ -177,6 +177,7 @@
     surbc = Message.Surb()
     surbc.fromData(account.generateSurbs(7))
     account.sendControl([createc, newpkc, surbc], idKey)
+    account['handshake'] = "initiated"
 
 def relayMessage(ui, config, nickname = None, to = None, input = None):
     body = None
@@ -258,7 +259,6 @@
 	setupAccount(config, ui, serverName = options.server, 
 		     usernamelist = myusernamelist,
 		     emailAddress = options.email, nickname = options.nickname)
-<<<<<<< .mine
 	sys.exit(0)
     if args[1] == "send":
 	parser = OptionParser()
@@ -276,10 +276,6 @@
 	config = Config.Config()
 	relayMessage(ui, config, options.nickname, options.to, options.input)
 	sys.exit(0)
-=======
-	sys.exit(1)
-
->>>>>>> .r200
     if args[1] == "process":
 	parser = OptionParser()
 	parser.add_option("-i", "--idtag", action = "store",
@@ -393,4 +389,4 @@
         (options, args) = myParseArgs(parser, sys.argv[2:])
         T = User.Tag()
         T.store(tag, idTag)
-        
+