diff options
| -rw-r--r-- | Mailman/Archiver/Archiver.py | 6 | ||||
| -rwxr-xr-x | Mailman/pythonlib/cgi.py | 2 | ||||
| -rwxr-xr-x | scripts/post | 6 |
3 files changed, 3 insertions, 11 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 diff --git a/scripts/post b/scripts/post index ac7c6a4f0..de919c52b 100755 --- a/scripts/post +++ b/scripts/post @@ -32,16 +32,12 @@ thus should not be re-posted to news if the list gates to a newsgroup. import sys import paths -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO - from Mailman import MailList from Mailman import Message from Mailman import Errors from Mailman import Utils from Mailman.Logging.Utils import LogStdErr +from Mailman.pythonlib.StringIO import StringIO LogStdErr("error", "post") |