Revision: 8166
http://svn.sourceforge.net/mailman/?rev=8166&view=rev
Author: tkikuchi
Date: 2007-03-09 22:03:16 -0800 (Fri, 09 Mar 2007)
Log Message:
-----------
csetstr is not set if lang==None. Use charset as string.
Modified Paths:
--------------
trunk/mailman/Mailman/Message.py
Modified: trunk/mailman/Mailman/Message.py
===================================================================
--- trunk/mailman/Mailman/Message.py 2007-03-09 22:54:25 UTC (rev 8165)
+++ trunk/mailman/Mailman/Message.py 2007-03-10 06:03:16 UTC (rev 8166)
@@ -205,15 +205,14 @@
def __init__(self, recip, sender, subject=None, text=None, lang=None):
Message.__init__(self)
- charset = None
+ charset = 'us-ascii'
if lang is not None:
- csetstr = Utils.GetCharSet(lang)
- charset = Charset(csetstr)
+ charset = Utils.GetCharSet(lang)
if text is not None:
- self.set_payload(text.encode(csetstr), charset)
+ self.set_payload(text.encode(charset), charset)
if subject is None:
subject = '(no subject)'
- self['Subject'] = Header(subject.encode(csetstr), charset,
+ self['Subject'] = Header(subject.encode(charset), charset,
header_name='Subject', errors='replace')
self['From'] = sender
if isinstance(recip, list):
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org