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

[jr at conuropsis.org]

Author: jr
Date: 2005-06-06 00:25:22 +0200 (Mon, 06 Jun 2005)
New Revision: 282

Modified:
   trunk/nym3/Client/Main.py
Log:
Handle correctly the case when the ref list passed to decode_message_references
is None and had the decoding of the list of references in the Delete case


Modified: trunk/nym3/Client/Main.py
===================================================================
--- trunk/nym3/Client/Main.py	2005-06-05 22:17:40 UTC (rev 281)
+++ trunk/nym3/Client/Main.py	2005-06-05 22:25:22 UTC (rev 282)
@@ -188,6 +188,8 @@
     #correspondance table.
     l = []
     loaded_h = {}
+    if refs == None:
+	return []
     for e in refs:
 	if ':' not in e:
 	    if is_hex_mid(e):
@@ -428,7 +430,12 @@
     account = get_account_from_nickname(ui, config, nickname,
 	    "No nickname given, abort\nUse -n <nickname>")   
     delmsg = Message.Delete()
-    midlist = map(binascii.unhexlify, midlist)
+    try:
+	l = decode_message_references(midlist, ['syn'],
+	        {'syn': (build_index, (ui, config, account))})
+    except DecodeException, inst:
+	ui.display(str(inst))
+	sys.exit(1)
     delmsg.fromData(midlist)
     try:
 	secring = Keyring.Keyring(config.secring_path)