diff options
Diffstat (limited to 'src/mailman/pipeline')
| -rw-r--r-- | src/mailman/pipeline/acknowledge.py | 3 | ||||
| -rw-r--r-- | src/mailman/pipeline/mime_delete.py | 2 | ||||
| -rw-r--r-- | src/mailman/pipeline/scrubber.py | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/mailman/pipeline/acknowledge.py b/src/mailman/pipeline/acknowledge.py index 744238f44..fcde6d6a5 100644 --- a/src/mailman/pipeline/acknowledge.py +++ b/src/mailman/pipeline/acknowledge.py @@ -36,6 +36,7 @@ from mailman.core.i18n import _ from mailman.email.message import UserNotification from mailman.interfaces.handler import IHandler from mailman.interfaces.languages import ILanguageManager +from mailman.utilities.string import oneline @@ -72,7 +73,7 @@ class Acknowledge: realname = mlist.real_name text = Utils.maketext( 'postack.txt', - {'subject' : Utils.oneline(original_subject, charset), + {'subject' : oneline(original_subject, charset), 'listname' : realname, 'listinfo_url': mlist.script_url('listinfo'), 'optionsurl' : member.options_url, diff --git a/src/mailman/pipeline/mime_delete.py b/src/mailman/pipeline/mime_delete.py index 3066f4003..43197a878 100644 --- a/src/mailman/pipeline/mime_delete.py +++ b/src/mailman/pipeline/mime_delete.py @@ -41,12 +41,12 @@ from email.Iterators import typed_subpart_iterator from os.path import splitext from zope.interface import implements -from mailman.Utils import oneline from mailman.config import config from mailman.core import errors from mailman.core.i18n import _ from mailman.interfaces.handler import IHandler from mailman.queue import Switchboard +from mailman.utilities.string import oneline from mailman.version import VERSION diff --git a/src/mailman/pipeline/scrubber.py b/src/mailman/pipeline/scrubber.py index a102d9f6b..63b133024 100644 --- a/src/mailman/pipeline/scrubber.py +++ b/src/mailman/pipeline/scrubber.py @@ -40,13 +40,14 @@ from mimetypes import guess_all_extensions from string import Template from zope.interface import implements -from mailman.Utils import oneline, websafe +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 # Path characters for common platforms |
