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

[jr at conuropsis.org]

Author: jr
Date: 2005-04-29 12:33:13 +0200 (Fri, 29 Apr 2005)
New Revision: 207

Modified:
   trunk/nym3/Client/Main.py
Log:
mutualize account selection + indentation


Modified: trunk/nym3/Client/Main.py
===================================================================
--- trunk/nym3/Client/Main.py	2005-04-28 20:21:59 UTC (rev 206)
+++ trunk/nym3/Client/Main.py	2005-04-29 10:33:13 UTC (rev 207)
@@ -87,24 +87,28 @@
       
     sr = Message.StrReader(msg)
     comList = sr.readCommandSToCList()
+    try:
+	account = Account.Account(config, nickname)
+    except NoSuchAccount:
+	print "%s: no account corresponding to this nickname" % nickname
+	sys.exit(1)
     for com in comList:
 	if (com.ct() == SToCCODE['Created']):
-	    account = Account.Account(config, nickname)
 	    # No challenge/response scheme decided yet:
 	    account['handshake'] = 'completed'
 	    account['username'] = com.nym
 	    ui.display("Account " + nickname + " successfully registered"
 		       " with username " + com.nym)
 	elif (com.ct() == SToCCODE['Status']):
-            pass
-        elif (com.ct() == SToCCODE['Summary']):
-            pass
-        elif (com.ct() == SToCCODE['Msg']):
-            pass
-        elif (com.ct() == SToCCODE['Dropped']):
-            pass
-        elif (com.ct() == SToCCODE['Error']):
-            pass
+	    pass
+	elif (com.ct() == SToCCODE['Summary']):
+	    pass
+	elif (com.ct() == SToCCODE['Msg']):
+	    pass
+	elif (com.ct() == SToCCODE['Dropped']):
+	    pass
+	elif (com.ct() == SToCCODE['Error']):
+	    pass
 
 def setupAccount(config, ui, serverName = None, usernamelist = None,
 		 emailAddress = None, nickname = None):