Changed import order

These changes close the lintian warning C0411.

offlineimap/CustomConfig.py

@@ -17,8 +17,8 @@
 import os
 import re
 from sys import exc_info
-import six
 from configparser import SafeConfigParser, Error
+import six
 from offlineimap.localeval import LocalEval
 
 

offlineimap/folder/Gmail.py

@@ -18,8 +18,8 @@
 """Folder implementation to support features of the Gmail IMAP server."""
 
 import re
-import six
 from sys import exc_info
+import six
 
 from offlineimap import imaputil, imaplibutil, OfflineImapError
 import offlineimap.accounts

offlineimap/folder/GmailMaildir.py

@@ -17,13 +17,13 @@
 
 
 import os
-import six
 from sys import exc_info
+import six
 
-from .Maildir import MaildirFolder
 import offlineimap.accounts
 from offlineimap import OfflineImapError
 from offlineimap import imaputil
+from .Maildir import MaildirFolder
 
 
 class GmailMaildirFolder(MaildirFolder):

offlineimap/folder/IMAP.py

@@ -22,10 +22,10 @@ import time
 from sys import exc_info
 import six
 
-from .Base import BaseFolder
 from offlineimap import imaputil, imaplibutil, emailutil, OfflineImapError
 from offlineimap import globals
 from offlineimap.virtual_imaplib2 import MonthNames
+from .Base import BaseFolder
 
 # Globals
 CRLF = '\r\n'

offlineimap/folder/Maildir.py

@@ -19,9 +19,9 @@ import socket
 import time
 import re
 import os
-import six
 from sys import exc_info
 from threading import Lock
+import six
 
 try:
     from hashlib import md5

offlineimap/imaplibutil.py

@@ -19,14 +19,13 @@ import fcntl
 import time
 import subprocess
 import threading
-import rfc6555
 import socket
 import errno
 import zlib
 from sys import exc_info
 from hashlib import sha512, sha384, sha256, sha224, sha1
-
 import six
+import rfc6555
 
 from offlineimap import OfflineImapError
 from offlineimap.ui import getglobalui

offlineimap/repository/Maildir.py

@@ -15,12 +15,12 @@
 #    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
+from stat import *
 from offlineimap import folder
 from offlineimap.ui import getglobalui
 from offlineimap.error import OfflineImapError
 from offlineimap.repository.Base import BaseRepository
-import os
-from stat import *
 
 
 class MaildirRepository(BaseRepository):

offlineimap/repository/__init__.py

@@ -14,8 +14,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 six
 from sys import exc_info
+import six
 
 try:
     from configparser import NoSectionError

test/OLItest/TestRunner.py

@@ -13,7 +13,6 @@
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-import offlineimap.virtual_imaplib2 as imaplib
 import unittest
 import logging
 import os
@@ -23,6 +22,7 @@ import shutil
 import subprocess
 import tempfile
 import random
+import offlineimap.virtual_imaplib2 as imaplib
 
 random.seed()
 

test/tests/test_00_globals.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # Copyright 2013 Eygene A. Ryabinkin
 
-from offlineimap import globals
 import unittest
+from offlineimap import globals
 
 
 class Opt:

test/tests/test_00_imaputil.py

@@ -16,11 +16,11 @@
 import unittest
 import logging
 
+from test.OLItest import OLITestLib
 from offlineimap import imaputil
 from offlineimap.ui import UI_LIST, setglobalui
 from offlineimap.CustomConfig import CustomConfigParser
 
-from test.OLItest import OLITestLib
 
 # Things need to be setup first, usually setup.py initializes everything.
 # but if e.g. called from command line, we take care of default values here: