summaryrefslogtreecommitdiff
path: root/src/leap/mail/smtp/gateway.py
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-09-26 09:59:28 -0300
committerTomás Touceda <chiiph@leap.se>2014-09-26 09:59:28 -0300
commit5bb6f18fe439b8edf99835e7a1f7030878edfbe0 (patch)
treef40728eed93389e8fc35374d2300775a01505a3b /src/leap/mail/smtp/gateway.py
parent8b1d8e88955fe5c1af8cee973abfdec4043a650c (diff)
parent60162102180930e05c454c91a01f0e7b1e0acafa (diff)
Merge branch 'release-0.3.10'0.3.10
Diffstat (limited to 'src/leap/mail/smtp/gateway.py')
-rw-r--r--src/leap/mail/smtp/gateway.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/mail/smtp/gateway.py b/src/leap/mail/smtp/gateway.py
index ef398d1..13d3bbf 100644
--- a/src/leap/mail/smtp/gateway.py
+++ b/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):
"""