diff options
| -rw-r--r-- | src/mailman/Archiver/HyperArch.py | 5 | ||||
| -rw-r--r-- | src/mailman/Utils.py | 6 | ||||
| -rw-r--r-- | src/mailman/pipeline/scrubber.py | 3 | ||||
| -rw-r--r-- | src/mailman/utilities/string.py | 7 |
4 files changed, 11 insertions, 10 deletions
diff --git a/src/mailman/Archiver/HyperArch.py b/src/mailman/Archiver/HyperArch.py index 7281cdb0f..9d219585d 100644 --- a/src/mailman/Archiver/HyperArch.py +++ b/src/mailman/Archiver/HyperArch.py @@ -50,6 +50,7 @@ from mailman.Archiver import pipermail from mailman.config import config from mailman.core.i18n import _, ctime from mailman.interfaces.listmanager import IListManager +from mailman.utilities.string import websafe log = logging.getLogger('mailman.error') @@ -119,9 +120,9 @@ html_charset = '<META http-equiv="Content-Type" ' \ def CGIescape(arg, lang=None): if isinstance(arg, unicode): - s = Utils.websafe(arg) + s = websafe(arg) else: - s = Utils.websafe(str(arg)) + s = websafe(str(arg)) return Utils.uncanonstr(s.replace('"', '"'), lang.code) # Parenthesized human name diff --git a/src/mailman/Utils.py b/src/mailman/Utils.py index 66e6b41b7..3989947c4 100644 --- a/src/mailman/Utils.py +++ b/src/mailman/Utils.py @@ -31,7 +31,6 @@ __all__ = [ import os import re -import cgi import errno import logging @@ -143,11 +142,6 @@ def wrap(text, column=70, honor_leading_ws=True): -def websafe(s): - return cgi.escape(s, quote=True) - - - class OuterExit(Exception): pass diff --git a/src/mailman/pipeline/scrubber.py b/src/mailman/pipeline/scrubber.py index 63b133024..f25c2978c 100644 --- a/src/mailman/pipeline/scrubber.py +++ b/src/mailman/pipeline/scrubber.py @@ -40,14 +40,13 @@ from mimetypes import guess_all_extensions from string import Template from zope.interface import implements -from mailman.Utils import websafe from mailman.config import config from mailman.core.errors import DiscardMessage from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler from mailman.utilities.filesystem import makedirs from mailman.utilities.modules import find_name -from mailman.utilities.string import oneline +from mailman.utilities.string import oneline, websafe # Path characters for common platforms diff --git a/src/mailman/utilities/string.py b/src/mailman/utilities/string.py index f53174c14..113403c96 100644 --- a/src/mailman/utilities/string.py +++ b/src/mailman/utilities/string.py @@ -23,9 +23,11 @@ __metaclass__ = type __all__ = [ 'expand', 'oneline', + 'websafe', ] +import cgi import logging from email.errors import HeaderParseError @@ -92,3 +94,8 @@ def oneline(s, cset='us-ascii', in_unicode=False): except (LookupError, UnicodeError, ValueError, HeaderParseError): # possibly charset problem. return with undecoded string in one line. return EMPTYSTRING.join(s.splitlines()) + + + +def websafe(s): + return cgi.escape(s, quote=True) |