[Nym3-commit] r329 - in trunk/nymbaron: . Client Server

[jr at conuropsis.org]

Author: jr
Date: 2005-10-09 14:50:13 +0200 (Sun, 09 Oct 2005)
New Revision: 329

Modified:
   trunk/nymbaron/Client/Account.py
   trunk/nymbaron/Mail.py
   trunk/nymbaron/Server/Main.py
   trunk/nymbaron/Server/User.py
   trunk/nymbaron/TODO
Log:
- bugfix and removal of unused imports (thx pychecker)
- update TODO


Modified: trunk/nymbaron/Client/Account.py
===================================================================
--- trunk/nymbaron/Client/Account.py	2005-10-09 01:17:03 UTC (rev 328)
+++ trunk/nymbaron/Client/Account.py	2005-10-09 12:50:13 UTC (rev 329)
@@ -29,7 +29,6 @@
 
 import copy
 import os
-import nymbaron.Client.Config as Config
 import nymbaron.Client.Keyring as Keyring
 import nymbaron.Mail as Mail
 import mixminion.Common
@@ -41,7 +40,6 @@
 import pickle
 import tempfile
 import time
-import re
 #TODO debugging cruft associated to seqno display
 import binascii
 

Modified: trunk/nymbaron/Mail.py
===================================================================
--- trunk/nymbaron/Mail.py	2005-10-09 01:17:03 UTC (rev 328)
+++ trunk/nymbaron/Mail.py	2005-10-09 12:50:13 UTC (rev 329)
@@ -26,7 +26,6 @@
 
     This package contains utilities to process mails."""
 
-import re
 import os
 import tempfile
 import random
@@ -157,7 +156,7 @@
     (q, r) = divmod(i, 16)
     return hex(q)[2:] + hex(r)[2:]
 
-def filter_header(body):
+def filter_header(msg):
     par = email.Parser.HeaderParser() 
     message = par.parsestr(msg)
     for h in forbidden_headers:
@@ -204,5 +203,5 @@
 
 if __name__ == '__main__':
     import sys
-    print synopsize(sys.stdin.read())
+    print synopsize(sys.stdin.read(), 0)
     print "And now, a random encoded mid: " + mid2filename(genMid(20))

Modified: trunk/nymbaron/Server/Main.py
===================================================================
--- trunk/nymbaron/Server/Main.py	2005-10-09 01:17:03 UTC (rev 328)
+++ trunk/nymbaron/Server/Main.py	2005-10-09 12:50:13 UTC (rev 329)
@@ -29,7 +29,6 @@
     This package contains an implementation of a nymbaron server."""
 
 import sys
-import os
 import getopt
 import nymbaron.Server.User as User
 import nymbaron.Server.Config as Config

Modified: trunk/nymbaron/Server/User.py
===================================================================
--- trunk/nymbaron/Server/User.py	2005-10-09 01:17:03 UTC (rev 328)
+++ trunk/nymbaron/Server/User.py	2005-10-09 12:50:13 UTC (rev 329)
@@ -30,7 +30,6 @@
 
 import os
 import nymbaron.Server.Config as Config
-import nymbaron.Common as Common
 import nymbaron.Mail as Mail
 import nymbaron.Crypto as Crypto
 import nymbaron.Message as Message
@@ -603,7 +602,7 @@
 		    foo = self.blobify(clearlist)
 		    self.syn.append(foo)
 		    ret.append(bfprepare(foo))
-		    nsym += 8
+		    nsyn += 8
 		    clearlist = []
 		continue
 	    elif (u[1] == 'encrypted'):

Modified: trunk/nymbaron/TODO
===================================================================
--- trunk/nymbaron/TODO	2005-10-09 01:17:03 UTC (rev 328)
+++ trunk/nymbaron/TODO	2005-10-09 12:50:13 UTC (rev 329)
@@ -8,16 +8,19 @@
         D Deferred
         X Abandoned
 
- - add default values indication in usage strings [client]
- - reorder the items of the usage string [client]
- - use clean_surbs once in a while [server]
+ 
  - periodically scan for emails that need to be relayed [server]
  - periodically scan for synopses that have stayed that need to be encrypted
  [server]
+ - fix bugs in encOldSyn (not defined global variables) [server]
+ . use clean_surbs once in a while (while adding surbs to a surbfile, the
+ surbfile is cleaned) [server]
+ o add default values indication in usage strings [client]
  o add command to change keyring passphrase [client]
  o add command to list accounts [client]
  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]
+ X reorder the items of the usage string [client]
 
 doc:
  - add doc strings in __init__.py in every module.