summaryrefslogtreecommitdiff
path: root/Mailman/Archiver/HyperArch.py
diff options
context:
space:
mode:
authorbwarsaw2006-04-17 13:10:09 +0000
committerbwarsaw2006-04-17 13:10:09 +0000
commit953d9bff95f70b66b1b6c04340959185a11c3d10 (patch)
treebd6aa3c6d30bcace2d628da71bc121f751ff1be2 /Mailman/Archiver/HyperArch.py
parent0ed815a216c7bb6f820cfdf99fc8d31bcfd19fc0 (diff)
downloadmailman-953d9bff95f70b66b1b6c04340959185a11c3d10.tar.gz
mailman-953d9bff95f70b66b1b6c04340959185a11c3d10.tar.zst
mailman-953d9bff95f70b66b1b6c04340959185a11c3d10.zip
Diffstat (limited to 'Mailman/Archiver/HyperArch.py')
-rw-r--r--Mailman/Archiver/HyperArch.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/Mailman/Archiver/HyperArch.py b/Mailman/Archiver/HyperArch.py
index e38d35e16..44f683d6d 100644
--- a/Mailman/Archiver/HyperArch.py
+++ b/Mailman/Archiver/HyperArch.py
@@ -31,7 +31,6 @@ import re
import sys
import time
import errno
-import types
import urllib
import logging
import weakref
@@ -133,7 +132,7 @@ html_charset = '<META http-equiv="Content-Type" ' \
'content="text/html; charset=%s">'
def CGIescape(arg, lang=None):
- if isinstance(arg, types.UnicodeType):
+ if isinstance(arg, unicode):
s = Utils.websafe(arg)
else:
s = Utils.websafe(str(arg))
@@ -560,7 +559,7 @@ class Article(pipermail.Article):
body = EMPTYSTRING.join(self.body)
cset = Utils.GetCharSet(self._lang)
# Coerce the body to Unicode and replace any invalid characters.
- if not isinstance(body, types.UnicodeType):
+ if not isinstance(body, unicode):
body = unicode(body, cset, 'replace')
if mm_cfg.ARCHIVER_OBSCURES_EMAILADDRS:
otrans = i18n.get_translation()
@@ -1168,7 +1167,7 @@ class HyperArchive(pipermail.T):
# 3. make it faster
# TK: Prepare for unicode obscure.
atmark = _(' at ')
- if lines and isinstance(lines[0], types.UnicodeType):
+ if lines and isinstance(lines[0], unicode):
atmark = unicode(atmark, Utils.GetCharSet(self.lang), 'replace')
source = lines[:]
dest = lines