Merge branch 'ns/clean-import-pep8' into next

offlineimap/accounts.py

@@ -18,11 +18,11 @@
 from offlineimap import threadutil, mbnames, CustomConfig
 from offlineimap.repository import Repository
 from offlineimap.ui import getglobalui
-from offlineimap.threadutil import InstanceLimitedThread, ExitNotifyThread
+from offlineimap.threadutil import InstanceLimitedThread
 from subprocess import Popen, PIPE
-from threading import Event, Lock
+from threading import Lock
 import os
-from Queue import Queue, Empty
+from Queue import Queue
 import sys
 import traceback
 

offlineimap/folder/Base.py

@@ -20,7 +20,6 @@ from offlineimap import threadutil
 from offlineimap.ui import getglobalui
 import os.path
 import re
-import sys
 import traceback
 
 class BaseFolder:

offlineimap/folder/LocalStatus.py

@@ -17,7 +17,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 from Base import BaseFolder
-import os, threading
+import os
+import threading
 
 magicline = "OFFLINEIMAP LocalStatus CACHE DATA - DO NOT MODIFY - FORMAT 1"
 

offlineimap/folder/Maildir.py

@@ -16,9 +16,11 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-import os.path, os, re, time, socket
+import socket
+import time
+import re
+import os
 from Base import BaseFolder
-from offlineimap import imaputil
 from threading import Lock
 
 try:

offlineimap/folder/UIDMaps.py

@@ -17,10 +17,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 from threading import *
-from offlineimap import threadutil
-from offlineimap.threadutil import InstanceLimitedThread
 from IMAP import IMAPFolder
-import os.path, re
+import os.path
 
 class MappingFolderMixIn:
     def _initmapping(self):

offlineimap/imaplibutil.py

@@ -15,7 +15,10 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-import re, socket, time, subprocess
+import re
+import socket
+import time
+import subprocess
 from offlineimap.ui import getglobalui
 import threading
 from offlineimap.imaplib2 import *

offlineimap/imapserver.py

@@ -20,7 +20,10 @@ from offlineimap import imaplib2 as imaplib
 from offlineimap import imaplibutil, imaputil, threadutil
 from offlineimap.ui import getglobalui
 from threading import *
-import thread, hmac, os, time, socket
+import thread
+import time
+import hmac
+import socket
 import base64
 
 from StringIO import StringIO

offlineimap/imaputil.py

@@ -16,7 +16,9 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-import re, string, types
+import re
+import string
+import types
 from offlineimap.ui import getglobalui
 quotere = re.compile('^("(?:[^"]|\\\\")*")')
 

offlineimap/repository/Gmail.py

@@ -16,8 +16,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 from offlineimap.repository.IMAP import IMAPRepository
-from offlineimap import folder, imaputil
+from offlineimap import folder
-from offlineimap.imapserver import IMAPServer
 
 class GmailRepository(IMAPRepository):
     """Gmail IMAP repository.

offlineimap/repository/LocalStatus.py

@@ -19,7 +19,8 @@
 from Base import BaseRepository
 from offlineimap import folder
 import offlineimap.folder.LocalStatus
-import os, re
+import os
+import re
 
 class LocalStatusRepository(BaseRepository):
     def __init__(self, reposname, account):

offlineimap/repository/Maildir.py

@@ -17,9 +17,8 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 from Base import BaseRepository
-from offlineimap import folder, imaputil
+from offlineimap import folder
 from offlineimap.ui import getglobalui
-from mailbox import Maildir
 import os
 from stat import *
 

offlineimap/syncmaster.py

@@ -16,7 +16,7 @@
 #    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.threadutil import threadlist, InstanceLimitedThread, ExitNotifyThread
+from offlineimap.threadutil import threadlist, InstanceLimitedThread
 from offlineimap.accounts import SyncableAccount, SigListener
 from threading import currentThread
 

offlineimap/threadutil.py

@@ -18,7 +18,9 @@
 
 from threading import *
 from Queue import Queue, Empty
-import sys, traceback, thread, time
+import traceback
+import thread
+import sys
 from offlineimap.ui import getglobalui
 
 profiledir = None

offlineimap/ui/Noninteractive.py

@@ -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
 
-import sys, time
+import sys
+import time
 from UIBase import UIBase
 
 class Basic(UIBase):

offlineimap/ui/TTY.py

@@ -18,7 +18,7 @@
 
 from UIBase import UIBase
 from getpass import getpass
-import select, sys
+import sys
 from threading import *
 
 class TTYUI(UIBase):