diff options
| author | Barry Warsaw | 2008-09-27 09:26:23 -0400 |
|---|---|---|
| committer | Barry Warsaw | 2008-09-27 09:26:23 -0400 |
| commit | 512145d93efc318adc0250dd53f4a53d8738f679 (patch) | |
| tree | b46813032dab87bda6ce8ffc1a867e6505050d93 /mailman/queue/outgoing.py | |
| parent | 6f4351721559e8b7b577d3a01216fec88121ed11 (diff) | |
| parent | 4600557c49f2259925dca45b302b2a78629b0b38 (diff) | |
| download | mailman-512145d93efc318adc0250dd53f4a53d8738f679.tar.gz mailman-512145d93efc318adc0250dd53f4a53d8738f679.tar.zst mailman-512145d93efc318adc0250dd53f4a53d8738f679.zip | |
thread merge
Diffstat (limited to 'mailman/queue/outgoing.py')
| -rw-r--r-- | mailman/queue/outgoing.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mailman/queue/outgoing.py b/mailman/queue/outgoing.py index 42b2d71db..624368930 100644 --- a/mailman/queue/outgoing.py +++ b/mailman/queue/outgoing.py @@ -26,9 +26,9 @@ import logging from datetime import datetime -from mailman import Errors from mailman import Message from mailman.configuration import config +from mailman.core import errors from mailman.queue import Runner, Switchboard from mailman.queue.bounce import BounceMixin @@ -82,7 +82,7 @@ class OutgoingRunner(Runner, BounceMixin): config.SMTPHOST, port) self._logged = True return True - except Errors.SomeRecipientsFailed, e: + except errors.SomeRecipientsFailed, e: # Handle local rejects of probe messages differently. if msgdata.get('probe_token') and e.permfailures: self._probe_bounce(mlist, msgdata['probe_token']) |
