From 953d9bff95f70b66b1b6c04340959185a11c3d10 Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Mon, 17 Apr 2006 13:10:09 +0000
Subject: Remove most uses of the types module, in favor of isinstance checks
 against the builtin types.  Two still remain: a check against ClassType and a
 check against MethodType.  Also, fix some hinky type comparisons to use
 isinstance() consistently.

---
 Mailman/Queue/CommandRunner.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Mailman/Queue')

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)
-- 
cgit v1.2.3-70-g09d2