From 43931f3c8a5d4bbaf7f7986b3981d698d987d7a8 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Wed, 26 Apr 2017 19:32:35 +0200
Subject: [style] pep8 fixes

---
 src/leap/bitmask/core/mail_services.py    | 6 ++++--
 src/leap/bitmask/keymanager/refresher.py  | 5 +++--
 src/leap/bitmask/keymanager/wrapper.py    | 2 --
 src/leap/bitmask/mail/imap/mailbox.py     | 5 +++--
 src/leap/bitmask/mail/incoming/service.py | 5 +++--
 5 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py
index eefbbc5..f390203 100644
--- a/src/leap/bitmask/core/mail_services.py
+++ b/src/leap/bitmask/core/mail_services.py
@@ -194,10 +194,12 @@ class SoledadService(HookableService):
 
             container = self._container
             if container.get_instance(userid):
-                self.log.debug('Passing a new SRP Token to Soledad: %s' % userid)
+                self.log.debug(
+                    'Passing a new SRP Token to Soledad: %s' % userid)
                 container.set_remote_auth_token(userid, token)
             else:
-                self.log.debug('Adding a new Soledad Instance: %s' % userid)
+                self.log.debug(
+                    'Adding a new Soledad Instance: %s' % userid)
                 container.add_instance(
                     userid, password, uuid=uuid, token=token)
 
diff --git a/src/leap/bitmask/keymanager/refresher.py b/src/leap/bitmask/keymanager/refresher.py
index d1ae9f8..d89a750 100644
--- a/src/leap/bitmask/keymanager/refresher.py
+++ b/src/leap/bitmask/keymanager/refresher.py
@@ -110,8 +110,9 @@ class RandomRefreshPublicKey(object):
             fetch_key_with_fingerprint(old_key.fingerprint)
 
         if old_updated_key.fingerprint != old_key.fingerprint:
-            self.log.error(ERROR_UNEQUAL_FINGERPRINTS %
-                         (old_key.fingerprint, old_updated_key.fingerprint))
+            self.log.error(
+                ERROR_UNEQUAL_FINGERPRINTS % (
+                    old_key.fingerprint, old_updated_key.fingerprint))
             defer.returnValue(None)
 
         yield self._maybe_unactivate_key(old_updated_key)
diff --git a/src/leap/bitmask/keymanager/wrapper.py b/src/leap/bitmask/keymanager/wrapper.py
index eb5074f..2b21379 100644
--- a/src/leap/bitmask/keymanager/wrapper.py
+++ b/src/leap/bitmask/keymanager/wrapper.py
@@ -35,8 +35,6 @@ except ImportError:
     GNUPG_NG = False
 
 
-
-
 class TempGPGWrapper(object):
     """
     A context manager that wraps a temporary GPG keyring which only contains
diff --git a/src/leap/bitmask/mail/imap/mailbox.py b/src/leap/bitmask/mail/imap/mailbox.py
index cc5d5df..3a1e8c1 100644
--- a/src/leap/bitmask/mail/imap/mailbox.py
+++ b/src/leap/bitmask/mail/imap/mailbox.py
@@ -427,8 +427,9 @@ class IMAPMailbox(object):
 
         def log_num_msg(result):
             exists, recent = tuple(result)
-            self.log.debug("NOTIFY (%r): there are %s messages, %s recent" % (
-                         self.mbox_name, exists, recent))
+            self.log.debug(
+                'NOTIFY (%r): there are %s messages, %s recent' % (
+                    self.mbox_name, exists, recent))
             return result
 
         d = defer.gatherResults(d_list)
diff --git a/src/leap/bitmask/mail/incoming/service.py b/src/leap/bitmask/mail/incoming/service.py
index 45d0e39..b1d48cf 100644
--- a/src/leap/bitmask/mail/incoming/service.py
+++ b/src/leap/bitmask/mail/incoming/service.py
@@ -281,8 +281,9 @@ class IncomingMail(Service):
 
         deferreds = []
         for index, doc in enumerate(doclist):
-            self.log.debug("processing incoming message: %d of %d"
-                         % (index + 1, num_mails))
+            self.log.debug(
+                'processing incoming message: %d of %d'
+                % (index + 1, num_mails))
             emit_async(catalog.MAIL_MSG_PROCESSING, self._userid,
                        str(index), str(num_mails))
 
-- 
cgit v1.2.3