summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Mailman/Utils.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index 67f2ff74f..a26861191 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -168,7 +168,7 @@ def DeliverToUser(msg, recipient, add_headers=[]):
def TrySMTPDelivery(recipient, sender, text, queue_entry):
- import sys, socket
+ import socket
import OutgoingQueue
# We need to get a modern smtplib. The Python 1.5.1 version does not
@@ -546,13 +546,16 @@ def IsAdministrivia(msg):
-def reraise(exc):
+def reraise(exc=None):
"""Use this function to re-raise an exception.
This implementation hides the differences between Python versions.
"""
# Python 1.5.2
# raise
# Earlier Python versions
+ if exc is None:
+ t, v, tb = sys.exc_info()
+ raise t, v, tb
raise exc, None, sys.exc_info()[2]