From abf9648fd84465ade34ff35e5007ddeb35aac4ea Mon Sep 17 00:00:00 2001 From: John Goerzen Date: Wed, 4 Jul 2007 18:53:48 +0100 Subject: [PATCH] Clean up imaplib imports --- offlineimap/folder/IMAP.py | 3 ++- offlineimap/imaplibutil.py | 2 +- offlineimap/init.py | 5 +++-- offlineimap/syncmaster.py | 5 +++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py index dadff81..155f5e1 100644 --- 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 b486a34..b8b776d 100644 --- a/offlineimap/imaplibutil.py +++ b/offlineimap/imaplibutil.py @@ -1,4 +1,4 @@ -# imaplib +# imaplib utilities # Copyright (C) 2002-2007 John Goerzen # # diff --git a/offlineimap/init.py b/offlineimap/init.py index 736f785..0cd6bfd 100644 --- 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 # # # 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 d10c5c3..64f2380 100644 --- 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 # # # 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