diff options
| author | Mark Sapiro <mark@msapiro.net> | 2008-10-03 14:59:00 -0700 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2008-10-03 14:59:00 -0700 |
| commit | 37234c51e4d852f2a830db02885e06404bc9a7df (patch) | |
| tree | 1c173d67b1021d298b6ce80a308d8b6585f74cb7 | |
| parent | c7b0eac7de83ed3afd584d733e2b73bf9789701a (diff) | |
| download | mailman2-37234c51e4d852f2a830db02885e06404bc9a7df.tar.gz mailman2-37234c51e4d852f2a830db02885e06404bc9a7df.tar.xz mailman2-37234c51e4d852f2a830db02885e06404bc9a7df.zip | |
Changed the stripping of trailing spaces from lines of the list headers
and footers to leave a trailing space on a '-- ' signature separator.
| -rw-r--r-- | Mailman/Handlers/Decorate.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Mailman/Handlers/Decorate.py b/Mailman/Handlers/Decorate.py index 64d569db..81bf7d33 100644 --- a/Mailman/Handlers/Decorate.py +++ b/Mailman/Handlers/Decorate.py @@ -227,7 +227,8 @@ def decorate(mlist, template, what, extradict=None): template = Utils.to_percent(template) # Interpolate into the template try: - text = re.sub(r' *\r?\n', r'\n', template % d) + text = re.sub(r'(?m)(?<!^--) +(?=\n)', '', + re.sub(r'\r\n', r'\n', template % d)) except (ValueError, TypeError), e: syslog('error', 'Exception while calculating %s:\n%s', what, e) what = what.upper() |