[style] pep8 fixes + pep8 script

4 files changed, 12 insertions, 5 deletions

diff --git a/pep8 b/pep8
new file mode 100755
index 0000000..d0da40e
--- /dev/null
+++ b/pep8
@@ -0,0 +1,2 @@
+#!/bin/sh
+pep8 src/leap/mail
diff --git a/src/leap/mail/imap/server.py b/src/leap/mail/imap/server.py
index 050521a..39f483f 100644
--- a/src/leap/mail/imap/server.py
+++ b/src/leap/mail/imap/server.py
@@ -158,11 +158,14 @@ class LEAPIMAPServer(imap4.IMAP4Server):
             else:
                 mf = imap4.IMessageFile(msg, None)
                 if mf is not None:
-                    return imap4.FileProducer(mf.open()).beginProducing(self.transport)
-                return imap4.MessageProducer(msg, None, self._scheduler).beginProducing(self.transport)
+                    return imap4.FileProducer(
+                        mf.open()).beginProducing(self.transport)
+                return imap4.MessageProducer(
+                    msg, None, self._scheduler).beginProducing(self.transport)
 
         else:
-            _w('BODY ' + imap4.collapseNestedLists([imap4.getBodyStructure(msg)]))
+            _w('BODY ' +
+               imap4.collapseNestedLists([imap4.getBodyStructure(msg)]))
 
     ##################################################################
     #
diff --git a/src/leap/mail/imap/tests/utils.py b/src/leap/mail/imap/tests/utils.py
index 83c3f29..a34538b 100644
--- a/src/leap/mail/imap/tests/utils.py
+++ b/src/leap/mail/imap/tests/utils.py
@@ -99,7 +99,8 @@ class IMAP4HelperMixin(SoledadTestMixin):
             # Soledad sync makes trial block forever. The sync it's mocked to
             # fix this problem. _mock_soledad_get_from_index can be used from
             # the tests to provide documents.
-            # TODO see here, possibly related? -- http://www.pythoneye.com/83_20424875/
+            # TODO see here, possibly related?
+            # -- http://www.pythoneye.com/83_20424875/
             self._soledad.sync = Mock()
 
             d = defer.Deferred()
diff --git a/src/leap/mail/tests/__init__.py b/src/leap/mail/tests/__init__.py
index b35107d..de0088f 100644
--- a/src/leap/mail/tests/__init__.py
+++ b/src/leap/mail/tests/__init__.py
@@ -34,7 +34,8 @@ from leap.common.testing.basetest import BaseLeapTest
 
 def _find_gpg():
     gpg_path = distutils.spawn.find_executable('gpg')
-    return os.path.realpath(gpg_path) if gpg_path is not None else "/usr/bin/gpg"
+    return (os.path.realpath(gpg_path)
+            if gpg_path is not None else "/usr/bin/gpg")
 
 
 class TestCaseWithKeyManager(unittest.TestCase, BaseLeapTest):