summaryrefslogtreecommitdiff
path: root/src/leap/mail/imap
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2014-01-02 17:14:03 -0400
committerKali Kaneko <kali@leap.se>2014-01-08 20:34:00 -0400
commita912729c4788d46d648a72126226741b63e0a37c (patch)
tree372a6f8f16fc544aa1f372ebfda2dd84ce1a5938 /src/leap/mail/imap
parent25a0aea875fd0d67238beed1237f7239474673ec (diff)
add documentation to the decorator, fix errorback.
* it also fixes the traceback in the errorback, thanks to chiiph, who reads documentation instead of whinning :D * other minor documentation corrections
Diffstat (limited to 'src/leap/mail/imap')
-rw-r--r--src/leap/mail/imap/fetch.py4
-rw-r--r--src/leap/mail/imap/messages.py5
2 files changed, 6 insertions, 3 deletions
diff --git a/src/leap/mail/imap/fetch.py b/src/leap/mail/imap/fetch.py
index fdf1412..cb200be 100644
--- a/src/leap/mail/imap/fetch.py
+++ b/src/leap/mail/imap/fetch.py
@@ -455,8 +455,8 @@ class LeapIncomingMail(object):
:param senderPubkey: The key of the sender of the message.
:type senderPubkey: OpenPGPKey
- :return: A unitary tuple containing a decrypted message and
- a bool indicating wether the signature is valid.
+ :return: A tuple containing a decrypted message and
+ a bool indicating whether the signature is valid.
:rtype: (Message, bool)
"""
log.msg('maybe decrypting inline encrypted msg')
diff --git a/src/leap/mail/imap/messages.py b/src/leap/mail/imap/messages.py
index c69c023..47c40d5 100644
--- a/src/leap/mail/imap/messages.py
+++ b/src/leap/mail/imap/messages.py
@@ -695,6 +695,9 @@ class LeapMessage(fields, MailParser, MBoxParser):
SoledadWriterPayload = namedtuple(
'SoledadWriterPayload', ['mode', 'payload'])
+# TODO we could consider using enum here:
+# https://pypi.python.org/pypi/enum
+
SoledadWriterPayload.CREATE = 1
SoledadWriterPayload.PUT = 2
SoledadWriterPayload.BODY_CREATE = 3
@@ -758,7 +761,7 @@ class SoledadDocWriter(object):
Message deduplication.
We do a query for the content hashes before writing to our beloved
- slcipher backend of Soledad. This means, by now, that:
+ sqlcipher backend of Soledad. This means, by now, that:
1. We will not store the same attachment twice, only the hash of it.
2. We will not store the same message body twice, only the hash of it.