[Nym3-commit] r65 - trunk

[nym3-devel@lists.noreply.org]

Author: jr
Date: 2004-08-04 14:23:08 +0200 (Wed, 04 Aug 2004)
New Revision: 65

Modified:
   trunk/Main.py
   trunk/Message.py
Log:
correct bugs
- ParseError -> Message.parseError(Main.py)
- StrReader.next raises IndexError if one reads too much chars(Message.py)


Modified: trunk/Main.py
===================================================================
--- trunk/Main.py	2004-08-04 12:02:31 UTC (rev 64)
+++ trunk/Main.py	2004-08-04 12:23:08 UTC (rev 65)
@@ -36,7 +36,7 @@
 	    print e
 	    sys.exit(2) #TODO is it the smart error code
 	comList = sr.readCommandCToSList()
-    except ParseError, inst:
+    except Message.ParseError, inst:
 	print inst
 	sys.exit(2) #TODO error code
     if(h.nym == ""):

Modified: trunk/Message.py
===================================================================
--- trunk/Message.py	2004-08-04 12:02:31 UTC (rev 64)
+++ trunk/Message.py	2004-08-04 12:23:08 UTC (rev 65)
@@ -65,6 +65,8 @@
 		"""return the next n characters"""
 		if(n<0):
 			raise BadArgument("StrReader.next : n < 0")
+		if(self.b+n > len(self.s)):
+			raise IndexError("StrReader.next : n too long")
 		self.a = self.b
 		self.b = self.b + n
 		return self.s[self.a:self.b]