[Nym3-commit] r82 - trunk

[nym3-devel@lists.noreply.org]

Author: jr
Date: 2004-08-05 08:02:14 +0200 (Thu, 05 Aug 2004)
New Revision: 82

Modified:
   trunk/Message.py
   trunk/User.py
Log:
YAEC
- Make Message.py compile
- comment the storage of data in User.__init__(is it ok?)


Modified: trunk/Message.py
===================================================================
--- trunk/Message.py	2004-08-04 18:25:42 UTC (rev 81)
+++ trunk/Message.py	2004-08-05 06:02:14 UTC (rev 82)
@@ -599,22 +599,22 @@
 				if(len(inter)!=2):
 					raise ParseError("Bad Formed Command : Policy")
 				self.val=strToIntBE(inter)
-			elif (opt == "EncryptSummaryAfter"):
+			elif (self.opt == "EncryptSummaryAfter"):
 				if(len(inter)!=2):
 					raise ParseError("Bad Formed Command : Policy")
 				self.val=strToIntBE(inter)
-			elif (opt == "MaxSURBsPerDay"):
+			elif (self.opt == "MaxSURBsPerDay"):
 				if(len(inter)!=2):
 					raise ParseError("Bad Formed Command : Policy")
 				self.val=strToIntBE(inter)
-			elif (opt == "HoldSURBs"):
+			elif (self.opt == "HoldSURBs"):
 				if(len(inter)!=2):
 					raise ParseError("Bad Formed Command : Policy")
 				self.val=strToIntBE(inter)
-			elif (opt == "HoldUntilAck"):
+			elif (self.opt == "HoldUntilAck"):
 				if(inter in [ 'never', 'quota', 'always' ]):
 					self.val=inter
-			elif (opt == "ShutdownPhrase"):
+			elif (self.opt == "ShutdownPhrase"):
 				self.val=inter
 		except (IndexError,BadArgument):
 			raise ParseError("Bad Formed Command : Policy")

Modified: trunk/User.py
===================================================================
--- trunk/User.py	2004-08-04 18:25:42 UTC (rev 81)
+++ trunk/User.py	2004-08-05 06:02:14 UTC (rev 82)
@@ -33,12 +33,15 @@
 	    self.data = pickle.load(f)
 	    f.close()
 	except IOError:
+            #TODO check this
+            #we do not need to save the data here, we can do it
+            #when the object is destroyed
 	    if create == 0: raise NoSuchUser()
-	    f = open(self.datafile, 'w')
+	    #f = open(self.datafile, 'w')
 	    self.data = Config.default_settings
 	    self.data['username'] = username
-	    pickle.dump(self.data, f)
-	    f.close()
+	    #pickle.dump(self.data, f)
+	    #f.close()
     
     def __del__(self):
 	self._save_index()
@@ -367,6 +370,9 @@
         return sendList
 
 if __name__ == '__main__':
-    a = User('laurent')
-    ec = a.relay("NYM3 TEST : " + repr(time.time()))
-    print "Errorcode is " + repr(ec)
+    try:
+        a = User('laurent')
+    except NoSuchUser:
+        print "this user does not exist"
+    #ec = a.relay("NYM3 TEST : " + repr(time.time()))
+    #print "Errorcode is " + repr(ec)