summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorklm1998-10-19 18:55:39 +0000
committerklm1998-10-19 18:55:39 +0000
commite8bcc2f389a185ec6716ee5d7d0ea6532bd5344a (patch)
treeac55fb32f3962aeea53a576855f98b2ab3ff7ab6
parent4eaf487caac29c3066d30e07db5f32292e8d96c7 (diff)
downloadmailman-e8bcc2f389a185ec6716ee5d7d0ea6532bd5344a.tar.gz
mailman-e8bcc2f389a185ec6716ee5d7d0ea6532bd5344a.tar.zst
mailman-e8bcc2f389a185ec6716ee5d7d0ea6532bd5344a.zip
-rw-r--r--Mailman/Archiver.py34
1 files changed, 16 insertions, 18 deletions
diff --git a/Mailman/Archiver.py b/Mailman/Archiver.py
index f15acfb35..b4d9e4fdf 100644
--- a/Mailman/Archiver.py
+++ b/Mailman/Archiver.py
@@ -120,24 +120,22 @@ class Archiver:
if os.fork():
return
try:
- try:
- from cStringIO import StringIO
- except ImportError:
- from StringIO import StringIO
- txt = msg.unixfrom
- for h in msg.headers:
- txt = txt + h
- if msg.body[0] != '\n':
- txt = txt + "\n"
- txt = txt + msg.body
- f = StringIO(txt)
- import HyperArch
- h = HyperArch.HyperArchive(self)
- h.processUnixMailbox(f, HyperArch.Article)
- h.close()
- f.close()
- finally:
- os._exit(0)
+ from cStringIO import StringIO
+ except ImportError:
+ from StringIO import StringIO
+ txt = msg.unixfrom
+ for h in msg.headers:
+ txt = txt + h
+ if msg.body[0] != '\n':
+ txt = txt + "\n"
+ txt = txt + msg.body
+ f = StringIO(txt)
+ import HyperArch
+ h = HyperArch.HyperArchive(self)
+ h.processUnixMailbox(f, HyperArch.Article)
+ h.close()
+ f.close()
+ os._exit(0)
def ArchiveFileName(self):