changeset 1961:8d3182e78ebc maint-0.6

merge from HEAD
author Richard Jones <richard@users.sourceforge.net>
date Fri, 19 Dec 2003 01:51:56 +0000
parents 267e4ba89b54
children f29a7edc31da
files CHANGES.txt roundup/mailgw.py
diffstat 2 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES.txt	Tue Dec 16 20:58:26 2003 +0000
+++ b/CHANGES.txt	Fri Dec 19 01:51:56 2003 +0000
@@ -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)
--- a/roundup/mailgw.py	Tue Dec 16 20:58:26 2003 +0000
+++ b/roundup/mailgw.py	Fri Dec 19 01:51:56 2003 +0000
@@ -73,8 +73,8 @@
 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 @@
             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

Roundup Issue Tracker: http://roundup-tracker.org/