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

[jr at conuropsis.org]

Author: jr
Date: 2005-06-12 12:31:50 +0200 (Sun, 12 Jun 2005)
New Revision: 297

Modified:
   trunk/nym3/Common.py
   trunk/nym3/Server/Main.py
   trunk/nym3/Server/User.py
   trunk/nym3/TODO
Log:
move lifeCycle from Common to Server.User and update the TODO


Modified: trunk/nym3/Common.py
===================================================================
--- trunk/nym3/Common.py	2005-06-12 08:32:49 UTC (rev 296)
+++ trunk/nym3/Common.py	2005-06-12 10:31:50 UTC (rev 297)
@@ -42,6 +42,3 @@
               "ShutdownPhrase"] 
 """The accepted strings identifying userPolicies"""
 
-lifeCycle = { 'nothing-sent' : 0, 'synopsis-sent' : 1,
-              'sent-in-full' : 2, 'deleted' : 3 }
-"""The lifecycle of a message on the server"""

Modified: trunk/nym3/Server/Main.py
===================================================================
--- trunk/nym3/Server/Main.py	2005-06-12 08:32:49 UTC (rev 296)
+++ trunk/nym3/Server/Main.py	2005-06-12 10:31:50 UTC (rev 297)
@@ -37,7 +37,7 @@
 import nym3.Common as Common
 import nym3.Mail as Mail
 
-lifeCycle = Common.lifeCycle
+lifeCycle = User.lifeCycle
 """The life cycle of a mail received by the server for a nym""" 
 
 def processIncoming(localpart, msg):

Modified: trunk/nym3/Server/User.py
===================================================================
--- trunk/nym3/Server/User.py	2005-06-12 08:32:49 UTC (rev 296)
+++ trunk/nym3/Server/User.py	2005-06-12 10:31:50 UTC (rev 297)
@@ -43,7 +43,8 @@
 from mixminion.BuildMessage import getNPacketsToEncode
 from mixminion.Packet import parseReplyBlocks, ParseError
 
-lifeCycle = Common.lifeCycle
+lifeCycle = { 'nothing-sent' : 0, 'synopsis-sent' : 1,
+              'sent-in-full' : 2, 'deleted' : 3 }
 """The life cycle of a mail received by a nym"""
 
 class NoSuchUser(Exception): pass

Modified: trunk/nym3/TODO
===================================================================
--- trunk/nym3/TODO	2005-06-12 08:32:49 UTC (rev 296)
+++ trunk/nym3/TODO	2005-06-12 10:31:50 UTC (rev 297)
@@ -9,8 +9,10 @@
         X Abandoned
 
  - use clean_surbs once in a while [server]
- - periodically scans for emails that need to be relayed [server]
- - use `email' lib to fiddle with an email to relay [server]
+ - periodically scan for emails that need to be relayed [server]
+ - periodically scan for synopses that have stayed that need to be encrypted
+ [server]
+ o use `email' lib to fiddle with an email to relay [server]
  o provide a `list-journal' command and a way to resend commands [client]
 
 doc:
@@ -20,11 +22,3 @@
  X add the print method which prints the content of a command object in a user
    friendly form
 
-Common.py:
- - move lifecycle to somewhere in the server, since the client should not use 
-   it
-
-Mail.py:
- - Check whether oldestMid is well situated. (Shouldn't it be in Commons, or 
- anyplace in the server module) In fact all the Mail.py module should go
- in the server. Lolo : your module, your call :)