diff options
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Message.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Mailman/Message.py b/Mailman/Message.py index b82ddf81..e8dd5953 100644 --- a/Mailman/Message.py +++ b/Mailman/Message.py @@ -1,17 +1,17 @@ -# 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. """Standard Mailman message object. @@ -20,6 +20,7 @@ This is a subclass of mimeo.Message but provides a slightly extended interface which is more convenient for use inside Mailman. """ +import re import email import email.Message import email.Utils @@ -33,7 +34,8 @@ from Mailman import Utils COMMASPACE = ', ' -VERSION = tuple([int(s) for s in email.__version__.split('.')]) +mo = re.match(r'([\d.]+)', email.__version__) +VERSION = tuple([int(s) for s in mo.group().split('.')]) @@ -200,7 +202,8 @@ class UserNotification(Message): self.set_payload(text, charset) if subject is None: subject = '(no subject)' - self['Subject'] = Header(subject, charset, header_name='Subject') + self['Subject'] = Header(subject, charset, header_name='Subject', + errors='replace') self['From'] = sender if isinstance(recip, ListType): self['To'] = COMMASPACE.join(recip) |