Backport from the trunk, and catalog regeneration.

2 files changed, 22 insertions, 16 deletions

diff --git a/bin/cleanarch b/bin/cleanarch
index 85a8df6a..8553ba77 100644
--- a/bin/cleanarch
+++ b/bin/cleanarch
@@ -1,19 +1,19 @@
 #! @PYTHON@
 
-# Copyright (C) 2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2003 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software 
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 """Clean up an .mbox archive file.
@@ -46,8 +46,8 @@ Options:
         Print this message and exit
 """
 
-import sys
 import re
+import sys
 import getopt
 import mailbox
 
@@ -92,17 +92,17 @@ def main():
     except getopt.error, msg:
         usage(1, msg)
 
-    quiet = 0
-    output = 1
+    quiet = False
+    output = True
     status = -1
 
     for opt, arg in opts:
         if opt in ('-h', '--help'):
             usage(0)
         elif opt in ('-q', '--quiet'):
-            quiet = 1
+            quiet = True
         elif opt in ('-n', '--dry-run'):
-            output = 0
+            output = False
         elif opt in ('-s', '--status'):
             try:
                 status = int(arg)
@@ -115,7 +115,8 @@ def main():
     lineno = 0
     statuscnt = 0
     messages = 0
-    while 1:
+    prevline = None
+    while True:
         lineno += 1
         line = sys.stdin.readline()
         if not line:
@@ -143,6 +144,10 @@ def main():
                     # It's a valid Unix-From line
                     messages += 1
                     if output:
+                        # Before we spit out the From_ line, make sure the
+                        # previous line was blank.
+                        if prevline is not None and prevline <> '\n':
+                            sys.stdout.write('\n')
                         sys.stdout.write(line)
                         sys.stdout.write(nextline)
             else:
@@ -157,6 +162,7 @@ def main():
             if statuscnt > 50:
                 print >> sys.stderr
                 statuscnt = 0
+        prevline = line
     print >> sys.stderr, _('%(messages)d messages found')
 
 
diff --git a/bin/withlist b/bin/withlist
index a9bd6361..345ff39d 100644
--- a/bin/withlist
+++ b/bin/withlist
@@ -1,19 +1,19 @@
 #! @PYTHON@
 #
-# Copyright (C) 1998,1999,2000,2001,2002 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software 
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 """General framework for interacting with a mailing list object.
@@ -105,13 +105,13 @@ As another example, say you wanted to change the password for a particular
 user on a particular list.  You could put the following function in a file
 called `changepw.py':
 
-from Mailman.Errors import NotAMember
+from Mailman.Errors import NotAMemberError
 
 def changepw(mlist, addr, newpasswd):
     try:
         mlist.setMemberPassword(addr, newpasswd)
         mlist.Save()
-    except NotAMember:
+    except NotAMemberError:
         print 'No address matched:', addr
 
 and run this from the command line: