------------------------------------------------------------
revno: 1129
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Fri 2008-10-03 14:59:00 -0700
message:
  Changed the stripping of trailing spaces from lines of the list headers
  and footers to leave a trailing space on a '-- ' signature separator.
modified:
  Mailman/Handlers/Decorate.py

=== modified file 'Mailman/Handlers/Decorate.py'
--- a/Mailman/Handlers/Decorate.py      2008-06-11 22:48:16 +0000
+++ b/Mailman/Handlers/Decorate.py      2008-10-03 21:59:00 +0000
@@ -227,7 +227,8 @@
         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()



--
Stable, maintained release series
https://code.launchpad.net/~mailman-coders/mailman/2.1

You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

Reply via email to