summaryrefslogtreecommitdiff
path: root/src/leap/bitmask
diff options
context:
space:
mode:
Diffstat (limited to 'src/leap/bitmask')
-rw-r--r--src/leap/bitmask/core/mail_services.py6
-rw-r--r--src/leap/bitmask/keymanager/refresher.py5
-rw-r--r--src/leap/bitmask/keymanager/wrapper.py2
-rw-r--r--src/leap/bitmask/mail/imap/mailbox.py5
-rw-r--r--src/leap/bitmask/mail/incoming/service.py5
5 files changed, 13 insertions, 10 deletions
diff --git a/src/leap/bitmask/core/mail_services.py b/src/leap/bitmask/core/mail_services.py
index eefbbc5c..f3902031 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 d1ae9f84..d89a7508 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 eb5074f3..2b21379a 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 cc5d5df6..3a1e8c10 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 45d0e398..b1d48cf4 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))