summaryrefslogtreecommitdiff
path: root/Mailman/Message.py
diff options
context:
space:
mode:
authorbwarsaw2006-04-17 13:10:09 +0000
committerbwarsaw2006-04-17 13:10:09 +0000
commit953d9bff95f70b66b1b6c04340959185a11c3d10 (patch)
treebd6aa3c6d30bcace2d628da71bc121f751ff1be2 /Mailman/Message.py
parent0ed815a216c7bb6f820cfdf99fc8d31bcfd19fc0 (diff)
downloadmailman-953d9bff95f70b66b1b6c04340959185a11c3d10.tar.gz
mailman-953d9bff95f70b66b1b6c04340959185a11c3d10.tar.zst
mailman-953d9bff95f70b66b1b6c04340959185a11c3d10.zip
Diffstat (limited to 'Mailman/Message.py')
-rw-r--r--Mailman/Message.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/Mailman/Message.py b/Mailman/Message.py
index bba484219..7216d7c9a 100644
--- a/Mailman/Message.py
+++ b/Mailman/Message.py
@@ -25,11 +25,10 @@ import re
import email
import email.Message
import email.Utils
+
from email.Charset import Charset
from email.Header import Header
-from types import ListType, StringType
-
from Mailman import mm_cfg
from Mailman import Utils
@@ -79,7 +78,7 @@ class Message(email.Message.Message):
chunks = []
cchanged = 0
for s, charset in v._chunks:
- if isinstance(charset, StringType):
+ if isinstance(charset, str):
charset = Charset(charset)
cchanged = 1
chunks.append((s, charset))
@@ -216,7 +215,7 @@ class UserNotification(Message):
self['Subject'] = Header(subject, charset, header_name='Subject',
errors='replace')
self['From'] = sender
- if isinstance(recip, ListType):
+ if isinstance(recip, list):
self['To'] = COMMASPACE.join(recip)
self.recips = recip
else: