[Nym3-commit] r324 - trunk/nymbaron/Client

[jr at conuropsis.org]

Author: jr
Date: 2005-10-08 17:40:12 +0200 (Sat, 08 Oct 2005)
New Revision: 324

Modified:
   trunk/nymbaron/Client/Main.py
Log:
Add tests to do nothing if the input is empty


Modified: trunk/nymbaron/Client/Main.py
===================================================================
--- trunk/nymbaron/Client/Main.py	2005-10-08 15:05:10 UTC (rev 323)
+++ trunk/nymbaron/Client/Main.py	2005-10-08 15:40:12 UTC (rev 324)
@@ -245,7 +245,9 @@
 
 def processMessage(msg, config, ui, nickname):
     """process incoming control message"""
-      
+
+    #if the msg is empty, do nothing
+    if not msg: return
     sr = Message.StrReader(msg)
     comList = sr.readCommandSToCList()
     try:
@@ -467,6 +469,8 @@
     except DecodeException, inst:
 	ui.display(str(inst))
 	sys.exit(1)
+    #if the midlist is empty, do nothing
+    if not midlist: return
     delmsg.fromData(midlist)
     try:
 	secring = Keyring.Keyring(config.secring_path)
@@ -491,6 +495,8 @@
     except DecodeException, inst:
 	ui.display(str(inst))
 	sys.exit(1)
+    #if the midlist is empty, do nothing
+    if not midlist: return
     getmsg.fromData(midlist)
     try:
 	secring = Keyring.Keyring(config.secring_path)
@@ -519,6 +525,8 @@
     except DecodeException, inst:
 	ui.display(str(inst))
 	sys.exit(1)
+    #if the seqnolist is empty, do nothing
+    if not seqnolist: return
     key = secring.get_key(account['admKey'])
     journal = account.get_journal()
     for seqno in seqnolist:
@@ -663,6 +671,8 @@
 	    "No nickname given, abort\nUse -n <nickname>")
     mids = decode_message_references(args, ['syn'],
 	        {'syn': (build_syn_index, (ui, config, account))})
+    #if mids is empty, do nothing
+    if not mids: return
     secring = decode_secring(config, ui)
     for mid in mids:
 	account.delete_syn(secring, mid)