Merge lp:~msapiro/mailman/digest_footer into lp:mailman

[Mark Sapiro]

This fixes https://bugs.launchpad.net/mailman/+bug/887610.

[Barry Warsaw (barry)]

Thanks Mark!

review: Approve (code)

=== modified file 'src/mailman/docs/NEWS.rst'
--- src/mailman/docs/NEWS.rst	2012-04-07 21:59:30 +0000
+++ src/mailman/docs/NEWS.rst	2012-04-11 23:02:21 +0000
@@ -56,6 +56,7 @@
 
 Bug fixes
 ---------
+ * Fixed the RFC 1153 digest footer to be compliant.  (LP: #887610)
  * Fixed a UnicodeError with non-ascii message bodies in the `approved` rule,
    given by Mark Sapiro. (LP: #949924)
  * Fixed a typo when returning the configuration file's header match checks.

=== modified file 'src/mailman/runners/digest.py'
--- src/mailman/runners/digest.py	2012-03-23 17:36:58 +0000
+++ src/mailman/runners/digest.py	2012-04-11 23:02:21 +0000
@@ -284,16 +284,17 @@
                         self._mlist.fqdn_listname, 
                         self._mlist.digest_footer_uri))
                 footer_text = ''                
-            # This is not strictly conformant RFC 1153.  The trailer is only
-            # supposed to contain two lines, i.e. the "End of ... Digest" line
-            # and the row of asterisks.  If this screws up MUAs, the solution
-            # is to add the footer as the last message in the RFC 1153 digest.
-            # I just hate the way that VM does that and I think it's confusing
-            # to users, so don't do it unless there's a clamor.
+            # MAS: There is no real place for the digest_footer in an RFC 1153
+            # compliant digest, so add it as an additional message with
+            # Subject: Digest Footer
             print >> self._text, self._separator30
             print >> self._text
+            print >> self._text, 'Subject: ' + _('Digest Footer')
+            print >> self._text
             print >> self._text, footer_text
             print >> self._text
+            print >> self._text, self._separator30
+            print >> self._text
         # Add the sign-off.
         sign_off = _('End of ') + self._digest_id
         print >> self._text, sign_off

=== modified file 'src/mailman/runners/docs/digester.rst'
--- src/mailman/runners/docs/digester.rst	2012-03-17 16:54:26 +0000
+++ src/mailman/runners/docs/digester.rst	2012-04-11 23:02:21 +0000
@@ -265,12 +265,16 @@
     <BLANKLINE>
     ------------------------------
     <BLANKLINE>
+    Subject: Digest Footer
+    <BLANKLINE>
     _______________________________________________
     Test mailing list
     [e-mail]
     http://lists.example.com/listinfo/[e-mail]
     <BLANKLINE>
     <BLANKLINE>
+    ------------------------------
+    <BLANKLINE>
     End of Test Digest, Vol 1, Issue 1
     **********************************
     <BLANKLINE>
@@ -459,12 +463,16 @@
     "''",
     "'------------------------------'",
     "''",
+    "'Subject: Pied de page des remises group\\xc3\\xa9es'",
+    "''",
     "'_______________________________________________'",
     "'Test mailing list'",
     "'[e-mail]'",
     "'http://lists.example.com/listinfo/[e-mail]'",
     "''",
     "''",
+    "'------------------------------'",
+    "''",
     "'Fin de Groupe Test, Vol 1, Parution 2'",
     "'*************************************'"]