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

[jr at conuropsis.org]

Author: jr
Date: 2005-06-06 00:43:41 +0200 (Mon, 06 Jun 2005)
New Revision: 283

Modified:
   trunk/nym3/Client/Main.py
Log:
Correct a bug and handle the dereferenciation in the Get case 


Modified: trunk/nym3/Client/Main.py
===================================================================
--- trunk/nym3/Client/Main.py	2005-06-05 22:25:22 UTC (rev 282)
+++ trunk/nym3/Client/Main.py	2005-06-05 22:43:41 UTC (rev 283)
@@ -431,7 +431,7 @@
 	    "No nickname given, abort\nUse -n <nickname>")   
     delmsg = Message.Delete()
     try:
-	l = decode_message_references(midlist, ['syn'],
+	midlist = decode_message_references(midlist, ['syn'],
 	        {'syn': (build_index, (ui, config, account))})
     except DecodeException, inst:
 	ui.display(str(inst))
@@ -454,7 +454,12 @@
     account = get_account_from_nickname(ui, config, nickname,
 	    "No nickname given, abort\nUse -n <nickname>")
     getmsg = Message.Get()
-    midlist = map(binascii.unhexlify, midlist)
+    try:
+	midlist = decode_message_references(midlist, ['syn'],
+	        {'syn': (build_index, (ui, config, account))})
+    except DecodeException, inst:
+	ui.display(str(inst))
+	sys.exit(1)
     getmsg.fromData(midlist)
     try:
 	secring = Keyring.Keyring(config.secring_path)