summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2014-09-09 10:52:01 -0500
committerRuben Pollan <meskio@sindominio.net>2014-09-09 10:52:01 -0500
commit198f2fdad6fe29945b6c3e65aa2489e4e100fe9e (patch)
treed7c8dcf961ef1529df143a7279927ec2df197a1d
parent23c99b0cc9163f4972c6650c285a0e61f7d91f25 (diff)
parentaea236ee3b9467bc6754f5a10ccda4c78e6bd66d (diff)
Merge branch 'kali/feature/return-deferred' into develop
-rw-r--r--mail/README.rst14
-rw-r--r--mail/src/leap/mail/imap/mailbox.py2
-rw-r--r--mail/src/leap/mail/smtp/gateway.py6
3 files changed, 9 insertions, 13 deletions
diff --git a/mail/README.rst b/mail/README.rst
index f758a66d..df752184 100644
--- a/mail/README.rst
+++ b/mail/README.rst
@@ -11,17 +11,11 @@ More info: https://leap.se
running tests
-------------
-Use trial to run the test suite.
-
-```
-trial leap.mail
-```
+Use trial to run the test suite::
+ trial leap.mail
... and all its goodies. To run all imap tests in a loop until some of them
-fails:
-
-```
-trial -u leap.mail.imap
-```
+fails::
+ trial -u leap.mail.imap
Read the *trial* manpage for more options .
diff --git a/mail/src/leap/mail/imap/mailbox.py b/mail/src/leap/mail/imap/mailbox.py
index aa2a3007..34cf5355 100644
--- a/mail/src/leap/mail/imap/mailbox.py
+++ b/mail/src/leap/mail/imap/mailbox.py
@@ -459,6 +459,8 @@ class SoledadMailbox(WithMsgFields, MBoxParser):
notify_on_disk=notify_on_disk)
if PROFILE_CMD:
do_profile_cmd(d, "APPEND")
+
+ # XXX should review now that we're not using qtreactor.
# A better place for this would be the COPY/APPEND dispatcher
# in server.py, but qtreactor hangs when I do that, so this seems
# to work fine for now.
diff --git a/mail/src/leap/mail/smtp/gateway.py b/mail/src/leap/mail/smtp/gateway.py
index ef398d1f..13d3bbf9 100644
--- a/mail/src/leap/mail/smtp/gateway.py
+++ b/mail/src/leap/mail/smtp/gateway.py
@@ -463,13 +463,13 @@ class EncryptedMessage(object):
"""
Sends the message.
- :return: A deferred with callbacks for error and success of this
- #message send.
+ :return: A deferred with callback and errback for
+ this #message send.
:rtype: twisted.internet.defer.Deferred
"""
d = deferToThread(self._route_msg)
d.addCallbacks(self.sendQueued, self.sendError)
- return
+ return d
def _route_msg(self):
"""