summaryrefslogtreecommitdiff
path: root/src/mailman/utilities/string.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/mailman/utilities/string.py')
-rw-r--r--src/mailman/utilities/string.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mailman/utilities/string.py b/src/mailman/utilities/string.py
index d6f0da286..6bbf3c6ea 100644
--- a/src/mailman/utilities/string.py
+++ b/src/mailman/utilities/string.py
@@ -17,9 +17,6 @@
"""String utilities."""
-from __future__ import absolute_import, print_function, unicode_literals
-
-__metaclass__ = type
__all__ = [
'expand',
'oneline',
@@ -73,9 +70,8 @@ def oneline(s, cset='us-ascii', in_unicode=False):
:rtype: string
"""
try:
- h = make_header(decode_header(s))
- ustr = h.__unicode__()
- line = EMPTYSTRING.join(ustr.splitlines())
+ h = str(make_header(decode_header(s)))
+ line = EMPTYSTRING.join(h.splitlines())
if in_unicode:
return line
else: