Update of /cvsroot/mailman/mailman/Mailman/Bouncers
In directory sc8-pr-cvs1:/tmp/cvs-serv17896
Modified Files:
DSN.py
Log Message:
True/False where appropriate.
Fixed the import of Stop, which was causing the import of this message
to fail. The symptom was this traceback message in logs/error:
AttributeError: 'module' object has no attribute 'process'
Index: DSN.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Bouncers/DSN.py,v
retrieving revision 2.9
retrieving revision 2.10
diff -u -d -r2.9 -r2.10
--- DSN.py 18 Aug 2003 02:50:16 -0000 2.9
+++ DSN.py 12 Sep 2003 13:30:20 -0000 2.10
@@ -24,7 +24,13 @@
from email.Utils import parseaddr
from cStringIO import StringIO
-from Mailman.BouncerAPI import Stop
+from Mailman.Bouncers.BouncerAPI import Stop
+
+try:
+ True, False
+except NameError:
+ True = 1
+ False = 0
@@ -52,11 +58,11 @@
# Some non-permanent failure, so ignore this block
continue
params = []
- foundp = 0
+ foundp = False
for header in ('original-recipient', 'final-recipient'):
for k, v in msgblock.get_params([], header):
if k.lower() == 'rfc822':
- foundp = 1
+ foundp = True
else:
params.append(k)
if foundp:
@@ -68,7 +74,7 @@
for a in addrs:
if a is not None:
realname, a = parseaddr(a)
- rtnaddrs[a] = 1
+ rtnaddrs[a] = True
return rtnaddrs.keys()
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
http://mail.python.org/mailman/listinfo/mailman-checkins
