3 files changed, 11 insertions, 11 deletions
diff --git a/src/leap/mail/imap/service/imap.py b/src/leap/mail/imap/service/imap.py
index 92d05cc..c3ae59a 100644
--- a/src/leap/mail/imap/service/imap.py
+++ b/src/leap/mail/imap/service/imap.py
@@ -17,7 +17,6 @@
 """
 IMAP service initialization
 """
-# TODO: leave only an implementor of IService in here
 import logging
 import os
 
@@ -29,13 +28,14 @@ from twisted.internet.protocol import ServerFactory
 from twisted.mail import imap4
 from twisted.python import log
 
-logger = logging.getLogger(__name__)
-
 from leap.common.events import emit, catalog
 from leap.common.check import leap_check
 from leap.mail.imap.account import IMAPAccount
 from leap.mail.imap.server import LEAPIMAPServer
 
+# TODO: leave only an implementor of IService in here
+
+logger = logging.getLogger(__name__)
 
 DO_MANHOLE = os.environ.get("LEAP_MAIL_MANHOLE", None)
 if DO_MANHOLE:
diff --git a/src/leap/mail/imap/tests/__init__.py b/src/leap/mail/imap/tests/__init__.py
index 32dacee..5cf60ed 100644
--- a/src/leap/mail/imap/tests/__init__.py
+++ b/src/leap/mail/imap/tests/__init__.py
@@ -10,13 +10,6 @@ code, using twisted.trial, for testing leap_mx.
 @copyright: © 2013 Kali Kaneko, see COPYLEFT file
 """
 
-__all__ = ['test_imap']
-
-
-def run():
-    """xxx fill me in"""
-    pass
-
 import os
 import u1db
 
@@ -25,12 +18,19 @@ from leap.common.testing.basetest import BaseLeapTest
 from leap.soledad.client import Soledad
 from leap.soledad.common.document import SoledadDocument
 
+__all__ = ['test_imap']
+
+
+def run():
+    """xxx fill me in"""
+    pass
 
 # -----------------------------------------------------------------------------
 # Some tests inherit from BaseSoledadTest in order to have a working Soledad
 # instance in each test.
 # -----------------------------------------------------------------------------
 
+
 class BaseSoledadIMAPTest(BaseLeapTest):
     """
     Instantiates GPG and Soledad for usage in LeapIMAPServer tests.
diff --git a/src/leap/mail/imap/tests/walktree.py b/src/leap/mail/imap/tests/walktree.py
index 4544856..f259a55 100644
--- a/src/leap/mail/imap/tests/walktree.py
+++ b/src/leap/mail/imap/tests/walktree.py
@@ -19,6 +19,7 @@ Tests for the walktree module.
 """
 import os
 import sys
+import pprint
 from email import parser
 
 from leap.mail import walk as W
@@ -118,7 +119,6 @@ if DEBUG and DO_CHECK:
     print "Structure: OK"
 
 
-import pprint
 print
 print "RAW DOCS"
 pprint.pprint(raw_docs)