diff options
| author | David Planella <david.planella@gmail.com> | 2008-11-22 21:32:49 +0100 |
|---|---|---|
| committer | David Planella <david.planella@gmail.com> | 2008-11-22 21:32:49 +0100 |
| commit | 85aae3995be31a5f10cf65235f15038dbdcdb261 (patch) | |
| tree | 38d0ed32dee807f463656fcb98cf579ce952fc6a /Mailman/Handlers/Decorate.py | |
| parent | 9476341ddf99f5a5138c2dc81c84a797b2c81579 (diff) | |
| parent | f0d392172bb2400927948004d2dc66c264ca2aa5 (diff) | |
| download | mailman2-85aae3995be31a5f10cf65235f15038dbdcdb261.tar.gz mailman2-85aae3995be31a5f10cf65235f15038dbdcdb261.tar.xz mailman2-85aae3995be31a5f10cf65235f15038dbdcdb261.zip | |
Merged from upstream (lp:mailman/stable)
Upgraded the repository format with 'bzr upgrade'
Diffstat (limited to 'Mailman/Handlers/Decorate.py')
| -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() |