summaryrefslogtreecommitdiff
path: root/Mailman/Queue/CommandRunner.py
diff options
context:
space:
mode:
authorbwarsaw2006-04-17 13:10:09 +0000
committerbwarsaw2006-04-17 13:10:09 +0000
commit953d9bff95f70b66b1b6c04340959185a11c3d10 (patch)
treebd6aa3c6d30bcace2d628da71bc121f751ff1be2 /Mailman/Queue/CommandRunner.py
parent0ed815a216c7bb6f820cfdf99fc8d31bcfd19fc0 (diff)
downloadmailman-953d9bff95f70b66b1b6c04340959185a11c3d10.tar.gz
mailman-953d9bff95f70b66b1b6c04340959185a11c3d10.tar.zst
mailman-953d9bff95f70b66b1b6c04340959185a11c3d10.zip
Diffstat (limited to 'Mailman/Queue/CommandRunner.py')
-rw-r--r--Mailman/Queue/CommandRunner.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/Mailman/Queue/CommandRunner.py b/Mailman/Queue/CommandRunner.py
index 978cb05cd..fe30a3cd3 100644
--- a/Mailman/Queue/CommandRunner.py
+++ b/Mailman/Queue/CommandRunner.py
@@ -30,7 +30,6 @@ from email.Header import decode_header, make_header, Header
from email.Iterators import typed_subpart_iterator
from email.MIMEMessage import MIMEMessage
from email.MIMEText import MIMEText
-from types import StringType, UnicodeType
from Mailman import LockFile
from Mailman import Message
@@ -86,7 +85,7 @@ class Results:
return
body = part.get_payload()
# text/plain parts better have string payloads
- assert isinstance(body, StringType) or isinstance(body, UnicodeType)
+ assert isinstance(body, basestring)
lines = body.splitlines()
# Use no more lines than specified
self.commands.extend(lines[:mm_cfg.DEFAULT_MAIL_COMMANDS_MAX_LINES])
@@ -164,7 +163,7 @@ To obtain instructions, send a message containing just the word "help".
charset = Utils.GetCharSet(self.msgdata['lang'])
encoded_resp = []
for item in resp:
- if isinstance(item, UnicodeType):
+ if isinstance(item, unicode):
item = item.encode(charset, 'replace')
encoded_resp.append(item)
results = MIMEText(NL.join(encoded_resp), _charset=charset)