summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2015-03-24 15:07:51 -0300
committerdrebs <drebs@leap.se>2015-03-25 17:03:05 -0300
commit938cada00298243f0cf51c9bfd460ecb16938b57 (patch)
treec881b5e166c42f7970ea09611382861d0b7718ef
parentb5ed3e4db16c8e3856b5c45409807d8f58cd957a (diff)
[bug] correctly return async bouncer deferred
-rw-r--r--changes/bug_correctly-return-async-bouncer-deferred1
-rw-r--r--src/leap/mx/mail_receiver.py6
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug_correctly-return-async-bouncer-deferred b/changes/bug_correctly-return-async-bouncer-deferred
new file mode 100644
index 0000000..15d3691
--- /dev/null
+++ b/changes/bug_correctly-return-async-bouncer-deferred
@@ -0,0 +1 @@
+ o Correctly return async bouncer deferred.
diff --git a/src/leap/mx/mail_receiver.py b/src/leap/mx/mail_receiver.py
index 630c982..7856594 100644
--- a/src/leap/mx/mail_receiver.py
+++ b/src/leap/mx/mail_receiver.py
@@ -96,6 +96,10 @@ class BouncerSubprocessProtocol(protocol.ProcessProtocol):
self._errBuffer = ""
self._d = None
+ @property
+ def deferred(self):
+ return self._d
+
def connectionMade(self):
self._d = defer.Deferred()
@@ -130,7 +134,7 @@ def async_check_output(args, msg):
"""
pprotocol = BouncerSubprocessProtocol(msg)
reactor.spawnProcess(pprotocol, args[0], args)
- return pprotocol.d
+ return pprotocol.deferred
class MailReceiver(Service):