[Nym3-commit] r184 - in trunk/nym3: . Server

[laurent at conuropsis.org]

Author: laurent
Date: 2005-04-10 18:11:40 +0200 (Sun, 10 Apr 2005)
New Revision: 184

Modified:
   trunk/nym3/Crypto.py
   trunk/nym3/Message.py
   trunk/nym3/Server/Main.py
Log:
Small typo in Server/Main, reindent Message.Header.


Modified: trunk/nym3/Crypto.py
===================================================================
--- trunk/nym3/Crypto.py	2005-04-10 15:55:13 UTC (rev 183)
+++ trunk/nym3/Crypto.py	2005-04-10 16:11:40 UTC (rev 184)
@@ -1,4 +1,5 @@
 # $Id$
+# -*- coding: utf-8 -*-
 # 
 # Copyright (c) 2004,2005 Jean-René Reinhard <jr at komite.net>
 # and Laurent Fousse <laurent at komite.net>.

Modified: trunk/nym3/Message.py
===================================================================
--- trunk/nym3/Message.py	2005-04-10 15:55:13 UTC (rev 183)
+++ trunk/nym3/Message.py	2005-04-10 16:11:40 UTC (rev 184)
@@ -242,50 +242,48 @@
 			raise
 	
 class Header:
-	"""Header Object
-	sig : signature
-	nl : nym length
-	nym : nym
-	seqNo : sequence number which identifies the message
-	length : header length"""
-	def __init__(self):
-		"""Build a Header empty object"""
-		pass
+    """Header Object
+       sig : signature
+       nl : nym length
+       nym : nym
+       seqNo : sequence number which identifies the message
+       length : header length"""
+    def __init__(self):
+	"""Build a Header empty object"""
+	pass
 
-	def fromData(self, nym, seqNo, sig = ""):
-		"""Fill a Header Object from a nym and sequence number and sig if provided
-		sig : signature
-		nl : nym length
-		nym : nym
-		seqNo : sequence number which identifies the message
-		length : header length"""
-		if(len(seqNo) != seqNoLength):
-			raise BadArgument("Buildheader.__init__ : seqNo length doesn't match seqNoLength")  
-		if(sig == ""):
-			self.sig = chr(0) * sigLength
-		else:
-			if(len(sig) != sigLength):
-				self.sig = chr(0) * (sigLength - len(sig)) + sig
-			else: self.sig = sig
-		self.nl = len(nym)
-		self.nym = nym
-		self.seqNo = seqNo
-		#self.length = sigLength + 1 + self.nl + seqNoLength
+    def fromData(self, nym, seqNo, sig = ""):
+	"""Fill a Header Object from a nym and sequence number and sig 
+	   if provided.
+	   sig : signature
+	   nl : nym length
+	   nym : nym
+	   seqNo : sequence number which identifies the message
+	   length : header length"""
+	if(len(seqNo) != seqNoLength):
+	    raise BadArgument("Buildheader.__init__ : seqNo length doesn't match seqNoLength")  
+	if(sig == ""): self.sig = chr(0) * sigLength
+	else:
+	    if(len(sig) != sigLength):
+		self.sig = chr(0) * (sigLength - len(sig)) + sig
+	    else: self.sig = sig
+	self.nl = len(nym)
+	self.nym = nym
+	self.seqNo = seqNo
+	#self.length = sigLength + 1 + self.nl + seqNoLength
 
-	def __str__(self):
-		"""Give the string of the header that would be sent in a control message"""
-		return self.sig + chr(self.nl) + self.nym + self.seqNo
+    def __str__(self):
+	"""Give the string of the header that would be sent in a control message"""
+	return self.sig + chr(self.nl) + self.nym + self.seqNo
 
-	def fromStrReader(self,sr):
-		"""Fill a Header from a StrReader 
-		"""
-		try:
-			self.sig = sr.next(sigLength)
-			self.nl = ord(sr.next(1))
-			self.nym = sr.next(nl)
-			self.seqNo = sr.next(seqNoLength)
-		except IndexError:
-			raise ParseError("Header too short")
+    def fromStrReader(self,sr):
+	"""Fill a Header from a StrReader"""
+	try:
+	    self.sig = sr.next(sigLength)
+	    self.nl = ord(sr.next(1))
+	    self.nym = sr.next(self.nl)
+	    self.seqNo = sr.next(seqNoLength)
+	except IndexError: raise ParseError("Header too short")
 
 
 ## class ReadHeader(Header):

Modified: trunk/nym3/Server/Main.py
===================================================================
--- trunk/nym3/Server/Main.py	2005-04-10 15:55:13 UTC (rev 183)
+++ trunk/nym3/Server/Main.py	2005-04-10 16:11:40 UTC (rev 184)
@@ -128,7 +128,7 @@
                    sys.exit(2) #TODO smart error code
         else:
             try:
-                nymUser = User.user(h.nym)
+                nymUser = User.User(h.nym)
             except User.NoSuchUser:
                 print "No such user"
                 sys.exit(73) #TODO is it the smart error code