merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -1,6 +1,11 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
+2004-??-?? 0.6.5
+Fixed:
+- mailgw handling of subject-line errors
+
+
 2003-12-17 0.6.4
 Fixed:
 - fixed date arithmetic to not allow day-of-month == 0 (sf bug 853306)

roundup/mailgw.py

@@ -73,8 +73,8 @@ class node. Any parts of other types are each stored in separate files
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception. 
 
-$Id: mailgw.py,v 1.126 2003-06-25 08:02:51 neaj Exp $
-'''
+$Id: mailgw.py,v 1.126.2.1 2003-12-19 01:51:56 richard Exp $
+"""
 
 import string, re, os, mimetools, cStringIO, smtplib, socket, binascii, quopri
 import time, random, sys
@@ -711,7 +711,7 @@ def handle_message(self, message):
             errors, props = setPropArrayFromString(self, cl, args, nodeid)
             # handle any errors parsing the argument list
             if errors:
-                errors = '\n- '.join(errors)
+                errors = '\n- '.join(map(str, errors))
                 raise MailUsageError, '''
 There were problems handling your subject line argument list:
 - %s