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

[jr at conuropsis.org]

Author: jr
Date: 2005-06-06 01:15:58 +0200 (Mon, 06 Jun 2005)
New Revision: 284

Modified:
   trunk/nym3/Client/Main.py
Log:
Correct bugs


Modified: trunk/nym3/Client/Main.py
===================================================================
--- trunk/nym3/Client/Main.py	2005-06-05 22:43:41 UTC (rev 283)
+++ trunk/nym3/Client/Main.py	2005-06-05 23:15:58 UTC (rev 284)
@@ -167,9 +167,10 @@
 	return False
     return len(ds) == Common.midLength
 
-class DecodeException(Exception): pass
-    """Exception thrown by a decoding function in case of error"""
-    
+class DecodeException(Exception):
+    """Exception raised by a decoding function in case of error"""
+    pass
+
 def decode_message_references(refs, keys, h):
     """Generate a list of mids from a list of message references, refs,
     a list of keys and a hashtable.
@@ -195,30 +196,30 @@
 	    if is_hex_mid(e):
 		l.append(binascii.unhexlify(e))
 	    else:
-		throw DecodeException("%s: not a valid mid" % e)
+		raise DecodeException("%s: not a valid mid" % e)
 	else:
 	    s = e.split(':', 1)
 	    if s[0] not in keys:
-		throw DecodeException("%s: not a valid index key" % s[0])
+		raise DecodeException("%s: not a valid index key" % s[0])
 	    try:
 		if not loaded_h.has_key(s[0]):
 		    if not h.has_key(s[0]):
-			throw DecodeException("%s: no correspondance table " +
+			raise DecodeException("%s: no correspondance table " +
 					"callback provided for this key" % s[0])
 		    f, a = h[s[0]]
 		    try:
 			loaded_h[s[0]] = f(*a)
 		    except:
-			throw DecodeException("%s: defective callback " +
+			raise DecodeException("%s: defective callback " +
 					"provided for this key" % s[0])
 		e2 = loaded_h[s[0]][s[1]]
 		if len(e2) == Common.midLength:
 		    l.append(e2)
 		else:
-		    throw DecodeException("%s: dereferenced value not " +
+		    raise DecodeException("%s: dereferenced value not " +
 					"a valid mid" % e)
 	    except KeyError:
-		throw DecodeException("%s: not a valid index for key %s" % 
+		raise DecodeException("%s: not a valid index for key %s" % 
 					(s[1], s[0]))
     return l