aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2015-10-14 09:42:19 -0700
committerMark Sapiro <mark@msapiro.net>2015-10-14 09:42:19 -0700
commitb7f4af5909c45a4084174d6b5a4c3ea9742fd997 (patch)
tree95eaf52e5679d67789a9aff0f47e8ec36834742f
parent7eb1148b3ef7df8e8de1fe7b8deef1532772f4ff (diff)
downloadmailman2-b7f4af5909c45a4084174d6b5a4c3ea9742fd997.tar.gz
mailman2-b7f4af5909c45a4084174d6b5a4c3ea9742fd997.tar.xz
mailman2-b7f4af5909c45a4084174d6b5a4c3ea9742fd997.zip
hanged CookHeaders to default to using space rather than tab as
continuation_ws when folding headers.
-rwxr-xr-xMailman/Handlers/CookHeaders.py6
-rwxr-xr-xNEWS3
2 files changed, 6 insertions, 3 deletions
diff --git a/Mailman/Handlers/CookHeaders.py b/Mailman/Handlers/CookHeaders.py
index 63e630cb..acb79166 100755
--- a/Mailman/Handlers/CookHeaders.py
+++ b/Mailman/Handlers/CookHeaders.py
@@ -34,7 +34,7 @@ from Mailman import Utils
from Mailman.i18n import _
from Mailman.Logging.Syslog import syslog
-CONTINUATION = ',\n\t'
+CONTINUATION = ',\n '
COMMASPACE = ', '
MAXLINELEN = 78
@@ -52,7 +52,7 @@ def _isunicode(s):
nonascii = re.compile('[^\s!-~]')
-def uheader(mlist, s, header_name=None, continuation_ws='\t', maxlinelen=None):
+def uheader(mlist, s, header_name=None, continuation_ws=' ', maxlinelen=None):
# Get the charset to encode the string in. Then search if there is any
# non-ascii character is in the string. If there is and the charset is
# us-ascii then we use iso-8859-1 instead. If the string is ascii only
@@ -350,7 +350,7 @@ def prefix_subject(mlist, msg, msgdata):
lines = str(subject).splitlines()
else:
lines = subject.splitlines()
- ws = '\t'
+ ws = ' '
if len(lines) > 1 and lines[1] and lines[1][0] in ' \t':
ws = lines[1][0]
msgdata['origsubj'] = subject
diff --git a/NEWS b/NEWS
index 603ab9be..975e53dd 100755
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,9 @@ Here is a history of user visible changes to Mailman.
Bug fixes and other patches
+ - Changed CookHeaders to default to using space rather than tab as
+ continuation_ws when folding headers. (LP: #1505878)
+
- Fixed the 'pidfile' path in the sample init.d script. (LP: # 1503422)
- Subject prefixing could fail to collapse multiple 'Re:' in an incomming