summaryrefslogtreecommitdiff
path: root/src/mailman/queue/outgoing.py
diff options
context:
space:
mode:
authorBarry Warsaw2011-05-18 23:08:42 -0400
committerBarry Warsaw2011-05-18 23:08:42 -0400
commit9887ba03016bbbd3a52d4a7df4f07906e984f431 (patch)
tree011783ba2d4b7f8ded7e8df66a921bde6a721ceb /src/mailman/queue/outgoing.py
parent2884180c24a27a3ecee3c804dad2270928c5d19b (diff)
downloadmailman-9887ba03016bbbd3a52d4a7df4f07906e984f431.tar.gz
mailman-9887ba03016bbbd3a52d4a7df4f07906e984f431.tar.zst
mailman-9887ba03016bbbd3a52d4a7df4f07906e984f431.zip
Diffstat (limited to 'src/mailman/queue/outgoing.py')
-rw-r--r--src/mailman/queue/outgoing.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/mailman/queue/outgoing.py b/src/mailman/queue/outgoing.py
index e591353f9..1823b42b5 100644
--- a/src/mailman/queue/outgoing.py
+++ b/src/mailman/queue/outgoing.py
@@ -31,7 +31,6 @@ from mailman.interfaces.membership import ISubscriptionService
from mailman.interfaces.mta import SomeRecipientsFailed
from mailman.interfaces.pending import IPendings
from mailman.queue import Runner
-from mailman.queue.bounce import BounceMixin
from mailman.utilities.datetime import now
from mailman.utilities.modules import find_name
@@ -45,12 +44,11 @@ smtp_log = logging.getLogger('mailman.smtp')
-class OutgoingRunner(Runner, BounceMixin):
+class OutgoingRunner(Runner):
"""The outgoing queue runner."""
def __init__(self, slice=None, numslices=1):
- Runner.__init__(self, slice, numslices)
- BounceMixin.__init__(self)
+ super(OutgoingRunner, self).__init__(slice, numslices)
# We look this function up only at startup time.
self._func = find_name(config.mta.outgoing)
# This prevents smtp server connection problems from filling up the
@@ -160,9 +158,3 @@ class OutgoingRunner(Runner, BounceMixin):
self._retryq.enqueue(msg, msgdata)
# We've successfully completed handling of this message
return False
-
- _do_periodic = BounceMixin._do_periodic
-
- def _clean_up(self):
- BounceMixin._clean_up(self)
- Runner._clean_up(self)