diff options
| author | bwarsaw | 2000-09-22 04:09:47 +0000 |
|---|---|---|
| committer | bwarsaw | 2000-09-22 04:09:47 +0000 |
| commit | 3471f9c117968f902aa6f42465a2d32b20dca1d0 (patch) | |
| tree | 706680106ffa30325e37c5946228f14dcab613ee /Mailman/Archiver/HyperArch.py | |
| parent | 1d0489d0e522da5d9e5546b5c4fb75e06046ca6b (diff) | |
| download | mailman-3471f9c117968f902aa6f42465a2d32b20dca1d0.tar.gz mailman-3471f9c117968f902aa6f42465a2d32b20dca1d0.tar.zst mailman-3471f9c117968f902aa6f42465a2d32b20dca1d0.zip | |
HyperArchive.__init__(): charset attribute needs to be initialized to
None otherwise pure-ascii archives fail to build.
Other de-Python-2.0-ifications.
Diffstat (limited to '')
| -rw-r--r-- | Mailman/Archiver/HyperArch.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Mailman/Archiver/HyperArch.py b/Mailman/Archiver/HyperArch.py index 84e979890..06a464784 100644 --- a/Mailman/Archiver/HyperArch.py +++ b/Mailman/Archiver/HyperArch.py @@ -258,7 +258,7 @@ class Article(pipermail.Article): self.decoded['subject'] = subject def decode_charset(self, field): - if field.find("=?") == -1: + if string.find(field, "=?") == -1: return None, None try: s, c = EncWord.decode(field) @@ -486,6 +486,7 @@ class HyperArchive(pipermail.T): self._unlocklist = unlock self._lock_file = None self._charsets = {} + self.charset = None if hasattr(self.maillist,'archive_volume_frequency'): if self.maillist.archive_volume_frequency == 0: @@ -559,7 +560,7 @@ class HyperArchive(pipermail.T): accum = [] for a in self.archives: accum.append(self.html_TOC_entry(a)) - d["archive_listing"] = "".join(accum) + d["archive_listing"] = string.join(accum, '') if not d.has_key("encoding"): d["encoding"] = "" return self.html_TOC_tmpl % d |