mbox

mech_imap.py

@@ -9,7 +9,7 @@ from twisted.internet import protocol, ssl
 from twisted.mail import imap4
 
 from serpent.config import conf
-from serpent.imap.mailbox import IMAPMailbox
+from serpent.imap.mbox import IMAPMailbox
 from serpent.misc import IMAP_HDELIM, IMAP_MBOX_REG, IMAP_ACC_CONN_NUM
 from shutil import rmtree, move
 

serpent/dataio.py

@@ -60,9 +60,9 @@ class SmtpFileStore(object):
 
 class MailDirStore(object):
     def __init__(self):
-        from serpent.imap import mailbox
+        from serpent.imap import mbox
         from mailbox import MaildirMessage
-        self.mbox = mailbox
+        self.mbox = mbox
         self.mbox.MaildirMessage = MaildirMessage
     def deliver(self, user, message):
         mdir = os.path.join(conf.app_dir, conf.maildir_user_path % user)

serpent/imap/mbox.py

@@ -1,4 +1,4 @@
-from mailbox import Maildir, MaildirMessage
+from mailbox import Maildir
 import os
 
 class ExtendedMaildir(Maildir):