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

[laurent at conuropsis.org]

Author: laurent
Date: 2006-02-05 18:42:50 +0100 (Sun, 05 Feb 2006)
New Revision: 449

Modified:
   trunk/nymbaron/Mail.py
   trunk/nymbaron/Server/Main.py
Log:
Small cleanups.


Modified: trunk/nymbaron/Mail.py
===================================================================
--- trunk/nymbaron/Mail.py	2006-02-05 17:34:22 UTC (rev 448)
+++ trunk/nymbaron/Mail.py	2006-02-05 17:42:50 UTC (rev 449)
@@ -30,7 +30,6 @@
 import tempfile
 import random
 import base64
-import string
 import email.Parser
 import nymbaron.Common as Common
 
@@ -64,7 +63,6 @@
     par = email.Parser.HeaderParser() 
     message = par.parsestr(msg)
     res = ''
-    print message.keys()
     for i in vheaders:
 	if i in message:
 	    res = res + i + ': ' + message[i][0:80] + "\n"
@@ -185,7 +183,8 @@
     ret = oldestMid
     while ret == oldestMid:
 	res = ""
-	for i in range(0, length): res = res + chr(random.randint(0, 255))
+	for _ in range(0, length):
+            res = res + chr(random.randint(0, 255))
 	ret = res
     return ret
 
@@ -193,7 +192,7 @@
     """Converts a mid in a file name"""
     res = base64.encodestring(mid)
     res = res.replace('/', '_')
-    res = string.strip(res)
+    res = res.strip(res)
     return res
 
 def filename2mid(mid):

Modified: trunk/nymbaron/Server/Main.py
===================================================================
--- trunk/nymbaron/Server/Main.py	2006-02-05 17:34:22 UTC (rev 448)
+++ trunk/nymbaron/Server/Main.py	2006-02-05 17:42:50 UTC (rev 449)
@@ -365,7 +365,7 @@
 	sys.exit(0)
 
     if args[1] == "encode-synopses":
-	sys.exit(0)
+        sys.exit(0)
     
     if args[1] == "help":
 	print usage_string