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

[jr at conuropsis.org]

Author: jr
Date: 2005-12-21 21:09:03 +0100 (Wed, 21 Dec 2005)
New Revision: 445

Modified:
   trunk/nymbaron/Client/Main.py
   trunk/nymbaron/Mail.py
Log:
- add Date to the headers displayed by list-syn [client]
- remove a debug print [client]


Modified: trunk/nymbaron/Client/Main.py
===================================================================
--- trunk/nymbaron/Client/Main.py	2005-12-19 22:26:13 UTC (rev 444)
+++ trunk/nymbaron/Client/Main.py	2005-12-21 20:09:03 UTC (rev 445)
@@ -599,7 +599,6 @@
     if len(synbox[0]) == 0:
 	ui.display("empty synbox")
 	return
-    print synbox
     mbox = account.get_mbox()[0]
     for i, mid in enumerate(synbox[1]):
 	(xnymseq, flag, syn) = synbox[0][mid]

Modified: trunk/nymbaron/Mail.py
===================================================================
--- trunk/nymbaron/Mail.py	2005-12-19 22:26:13 UTC (rev 444)
+++ trunk/nymbaron/Mail.py	2005-12-21 20:09:03 UTC (rev 445)
@@ -93,13 +93,15 @@
     """
     par = email.Parser.HeaderParser()
     syn = par.parsestr(synopsis)
-    from_f = syn['From']
-    subj_f = syn['Subject']
-    if from_f == None:
-	from_f = ""
-    if subj_f == None:
-	subj_f = ""
-    return "From: %s\nSubject: %s" % (from_f, subj_f)
+    summary_headers = ['From', 'Subject', 'Date']
+    res = ""
+    for header in summary_headers:
+	if syn[header] == None:
+	    syn[header] = ""
+	res = res + header + ': ' + syn[header] + '\n'
+    if len(res):
+	res = res[:-1]
+    return res
 
 def XNymSeq(synopsis):
     """returns an integer, the sequence number of the provided synopsis.