Clean up imaplib imports

[offlineimap] / offlineimap / folder / IMAP.py

diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py
index d89059670e2985668192ae793365f467b2369cf4..155f5e1a58366e8d9763b3f4d7d7e68bff27ff5f 100644 (file)
--- a/offlineimap/folder/IMAP.py
+++ b/offlineimap/folder/IMAP.py
@@ -1,5 +1,5 @@
 # IMAP folder support
 # IMAP folder support

-# Copyright (C) 2002-2004 John Goerzen
+# Copyright (C) 2002-2007 John Goerzen

 # <jgoerzen@complete.org>
 #
 #    This program is free software; you can redistribute it and/or modify
 # <jgoerzen@complete.org>
 #
 #    This program is free software; you can redistribute it and/or modify


@@ -17,7 +17,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 from Base import BaseFolder
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 from Base import BaseFolder

-from offlineimap import imaputil, imaplib
+import imaplib
+from offlineimap import imaputil, imaplibutil

 from offlineimap.ui import UIBase
 from offlineimap.version import versionstr
 import rfc822, time, string, random, binascii, re
 from offlineimap.ui import UIBase
 from offlineimap.version import versionstr
 import rfc822, time, string, random, binascii, re


@@ -98,7 +99,7 @@ class IMAPFolder(BaseFolder):
             else:
                 uid = long(options['UID'])
                 flags = imaputil.flagsimap2maildir(options['FLAGS'])
             else:
                 uid = long(options['UID'])
                 flags = imaputil.flagsimap2maildir(options['FLAGS'])

-                rtime = imaplib.Internaldate2epoch(messagestr)
+                rtime = imaplibutil.Internaldate2epoch(messagestr)

                 self.messagelist[uid] = {'uid': uid, 'flags': flags, 'time': rtime}
 
     def getmessagelist(self):
                 self.messagelist[uid] = {'uid': uid, 'flags': flags, 'time': rtime}
 
     def getmessagelist(self):