Clean up imaplib imports

diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py
index dadff8138ca9b5c2bf3f90e8a0818735f85886a7..155f5e1a58366e8d9763b3f4d7d7e68bff27ff5f 100644 (file)
--- a/offlineimap/folder/IMAP.py
+++ b/offlineimap/folder/IMAP.py
@@ -17,7 +17,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 from Base import BaseFolder
-from offlineimap import imaputil, imaplib, imaplibutil
+import imaplib
+from offlineimap import imaputil, imaplibutil
 from offlineimap.ui import UIBase
 from offlineimap.version import versionstr
 import rfc822, time, string, random, binascii, re

diff --git a/offlineimap/imaplibutil.py b/offlineimap/imaplibutil.py
index b486a341a5646f6119bc320e3b6d98aa05982f03..b8b776dbc297a36de7c61f3b1d1be85cd7d26ade 100644 (file)
--- a/offlineimap/imaplibutil.py
+++ b/offlineimap/imaplibutil.py
@@ -1,4 +1,4 @@
-# imaplib
+# imaplib utilities
 # Copyright (C) 2002-2007 John Goerzen
 # <jgoerzen@complete.org>
 #

diff --git a/offlineimap/init.py b/offlineimap/init.py
index 736f7850d18ef2529493be7ed06dc0ff4480f13a..0cd6bfdf6952c137b2357ea986edca8309c226ee 100644 (file)
--- a/offlineimap/init.py
+++ b/offlineimap/init.py
@@ -1,5 +1,5 @@
 # OfflineIMAP initialization code
-# Copyright (C) 2002, 2003 John Goerzen
+# Copyright (C) 2002-2007 John Goerzen
 # <jgoerzen@complete.org>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,8 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-from offlineimap import imaplib, imapserver, repository, folder, mbnames, threadutil, version, syncmaster, accounts
+import imaplib
+from offlineimap import imapserver, repository, folder, mbnames, threadutil, version, syncmaster, accounts
 from offlineimap.localeval import LocalEval
 from offlineimap.threadutil import InstanceLimitedThread, ExitNotifyThread
 from offlineimap.ui import UIBase

diff --git a/offlineimap/syncmaster.py b/offlineimap/syncmaster.py
index d10c5c36bb929391fecd4ec045d45d43414db2fc..64f2380b3fc86466300317e0debb9a6ef47cd0bf 100644 (file)
--- a/offlineimap/syncmaster.py
+++ b/offlineimap/syncmaster.py
@@ -1,5 +1,5 @@
 # OfflineIMAP synchronization master code
-# Copyright (C) 2002 John Goerzen
+# Copyright (C) 2002-2007 John Goerzen
 # <jgoerzen@complete.org>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -16,7 +16,8 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-from offlineimap import imaplib, imapserver, repository, folder, mbnames, threadutil, version
+import imaplib
+from offlineimap import imapserver, repository, folder, mbnames, threadutil, version
 from offlineimap.threadutil import InstanceLimitedThread, ExitNotifyThread
 import offlineimap.accounts
 from offlineimap.accounts import SyncableAccount