From: Fred Drake <fdrake@acm.org>
Date: Thu, 14 Sep 2000 14:44:43 +0000 (+0000)
Subject: Detlef Lannert <lannert@uni-duesseldorf.de>:
X-Git-Tag: v2.0b2~337
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e108a027235fd99193fc8b617dd6a6b0f531a40c;p=thirdparty%2FPython%2Fcpython.git

Detlef Lannert <lannert@uni-duesseldorf.de>:
mailbox.py (from the CVS tree) doesn't work with qmail Maildirs:
Filenames are completed when the directories are scanned, and
the directory name is prepended again in the next() method.

Another suggestion: Change the print statement in the _test()
driver to show two more date characters (probably the length
has increased due to the recent Y2K hype ;). Now it shows the
complete date, including the seconds -- at least for me. (I've
also made the sender field left justified, in case it is ever
shorter than the field width).
---

diff --git a/Lib/mailbox.py b/Lib/mailbox.py
index 4518e7d0629e..5c6cc8874d8d 100755
--- a/Lib/mailbox.py
+++ b/Lib/mailbox.py
@@ -201,7 +201,7 @@ class Maildir:
             return None
         fn = self.boxes[0]
         del self.boxes[0]
-        fp = open(os.path.join(self.dirname, fn))
+        fp = open(fn)
         return rfc822.Message(fp)
 
 
@@ -275,7 +275,7 @@ def _test():
             f = msg.getheader('from') or ""
             s = msg.getheader('subject') or ""
             d = msg.getheader('date') or ""
-            print '%20.20s   %18.18s   %-30.30s'%(f, d[5:], s)
+            print '-%20.20s   %20.20   %-30.30s'%(f, d[5:], s)
 
 
 if __name__ == '__main__':