Update of /cvsroot/tmda/tmda/contrib
In directory usw-pr-cvs1:/tmp/cvs-serv414/contrib

Modified Files:
        ChangeLog collectaddys 
Log Message:
Remove Python 2.0 compatibility, and also Reply-To from list of
default headers to scan.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tmda/tmda/contrib/ChangeLog,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- ChangeLog   1 Oct 2002 19:55:32 -0000       1.84
+++ ChangeLog   12 Nov 2002 00:18:10 -0000      1.85
@@ -1,3 +1,8 @@
+2002-11-11  Jason R. Mastaler  <[EMAIL PROTECTED]>
+
+       * collectaddys (addys): Remove Python 2.0 compatibility, and also
+       Reply-To from list of default headers to scan.
+
 2002-10-01  Jason R. Mastaler  <[EMAIL PROTECTED]>
 
        * def2html: New file.

Index: collectaddys
===================================================================
RCS file: /cvsroot/tmda/tmda/contrib/collectaddys,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- collectaddys        28 Mar 2002 20:26:39 -0000      1.2
+++ collectaddys        12 Nov 2002 00:18:10 -0000      1.3
@@ -31,7 +31,6 @@
 Sample usage:
 
 $ cd ~/Mail/archive/
-$ collectaddys
 $ collectaddys > ~/.tmda/lists/whitelist
 """
 
@@ -39,7 +38,7 @@
 import os
 
 # Collect addresses from these headers only; season to taste.
-hdrs = [ 'from', 'reply-to', 'return-path', 'sender' ]
+hdrs = [ 'from', 'return-path', 'sender' ]
 
 addys = []
 
@@ -55,11 +54,7 @@
             mb = mailbox.MHMailbox(path)
     # Otherwise assume a Unix-style mbox file.
     else:
-        try:
-            # PortableUnixMailbox in Python >= 2.1 only
-            mb = mailbox.PortableUnixMailbox(open(path))
-        except AttributeError:
-            mb = mailbox.UnixMailbox(open(path))
+        mb = mailbox.PortableUnixMailbox(open(path))
     while 1:
         msg = mb.next()
         if not msg:

_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs

Reply via email to