summaryrefslogtreecommitdiff
path: root/Mailman
diff options
context:
space:
mode:
Diffstat (limited to 'Mailman')
-rw-r--r--Mailman/Archiver/Archiver.py6
-rwxr-xr-xMailman/pythonlib/cgi.py2
2 files changed, 2 insertions, 6 deletions
diff --git a/Mailman/Archiver/Archiver.py b/Mailman/Archiver/Archiver.py
index e580fad90..5e3197768 100644
--- a/Mailman/Archiver/Archiver.py
+++ b/Mailman/Archiver/Archiver.py
@@ -30,12 +30,8 @@ import sys, os, string
import errno
import traceback
-try:
- from cStringIO import StringIO
-except ImportError:
- from StringIO import StringIO
-
from Mailman.Utils import reraise, mkdir, SafeDict
+from Mailman.pythonlib.StringIO import StringIO
#
# package/project modules
diff --git a/Mailman/pythonlib/cgi.py b/Mailman/pythonlib/cgi.py
index ab6dda843..0c1695c10 100755
--- a/Mailman/pythonlib/cgi.py
+++ b/Mailman/pythonlib/cgi.py
@@ -422,7 +422,7 @@ import os
import urllib
import mimetools
import rfc822
-from StringIO import StringIO
+from Mailman.pythonlib.StringIO import StringIO
# Logging support