File mailman-2.1.4-avoid-headerfolding-python21.diff of Package mailman

Overview Repositories Revisions Requests Users Attributes Meta

File mailman-2.1.4-avoid-headerfolding-python21.diff of Package mailman (Revision 48f355b7d9a048152a3cc3f1abfea815)

Currently displaying revision 48f355b7d9a048152a3cc3f1abfea815 , Show latest

Attempt to make Mailman leave signatures intact.
Submessage parts will not get headers folded if the new 
Mailman.Generator.Generator class is used.
Hopefully fixes, Mailman SF Bug:
	[ 815297 ] Breaking signatures in message/rfc822 attachement!

Removed unused class ScrubberGenerator from Handlers/Scrupper.py along the way. 
It irritated me while searching for the solution.

20040412 Bernhard Reiter <bernhard@gnu.org>

Added True/False fallbacks for Python 2.1

20040414 Thomas Arendsen Hein <thomas@intevation.de>

Index: mailman-2.1.11/Mailman/Generator.py
===================================================================
--- /dev/null
+++ mailman-2.1.11/Mailman/Generator.py
@@ -0,0 +1,64 @@
+# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Author: Bernhard Reiter <bernhard@gnu.org>
+
+"""Standard Mailman generator object.
+
+A subclass of email.Generator which only folds long headers
+in the top object level. 
+This is needed because Mailman should leave the reveiced message parts alone.
+Otherwise is might change subparts over which a signature was calculated,
+breaking it while doing so.
+"""
+
+import email
+import email.Generator
+
+try:
+    True, False
+except NameError:
+    True = 1
+    False = 0
+
+
+class Generator(email.Generator.Generator):
+    """Generates output from a Message object tree, keeping signatures.
+    
+    Using the a trick from Mailman/Handlers/Scrubber.py (revs 2.0-2.15):
+
+    Most other Generator will be created not setting the foldheader flag,
+    as we do not overwrite clone(). The original clone() does not
+    set foldheaders.
+
+    So you need to set foldheaders if you want the toplevel to fold headers.
+    """
+    def __init__(self, outfp, mangle_from_=True,
+                 maxheaderlen=78, foldheaders=False):
+        email.Generator.Generator.__init__(self, outfp, mangle_from_=False)
+        self.__foldheaders = foldheaders
+
+    def _write_headers(self, msg):
+        if self.__foldheaders:
+            email.Generator.Generator._write_headers(self, msg)
+        else:
+            # the following is 
+            # unrolled from email.Generator.Generator._write_headers()
+            for h, v in msg.items():
+            	print >> self._fp, '%s:' % h,
+                print >> self._fp, v
+            print >> self._fp
+
Index: mailman-2.1.11/Mailman/Mailbox.py
===================================================================
--- mailman-2.1.11.orig/Mailman/Mailbox.py
+++ mailman-2.1.11/Mailman/Mailbox.py
@@ -22,10 +22,10 @@ import mailbox
 
 import email
 from email.Parser import Parser
-from email.Generator import Generator
 from email.Errors import MessageParseError
 
 from Mailman import mm_cfg
+from Mailman.Generator import Generator
 from Mailman.Message import Message
 
 try:
@@ -65,7 +65,7 @@ class Mailbox(mailbox.PortableUnixMailbo
         # Seek to the last char of the mailbox
         self.fp.seek(1, 2)
         # Create a Generator instance to write the message to the file
-        g = Generator(self.fp)
+        g = Generator(self.fp, foldheaders=True)
         g.flatten(msg, unixfrom=True)
         # Add one more trailing newline for separation with the next message
         # to be appended to the mbox.
Index: mailman-2.1.11/Mailman/Message.py
===================================================================
--- mailman-2.1.11.orig/Mailman/Message.py
+++ mailman-2.1.11/Mailman/Message.py
@@ -22,6 +22,8 @@ which is more convenient for use inside
 """
 
 import re
+from cStringIO import StringIO
+
 import email
 import email.Message
 import email.Utils
@@ -32,6 +34,13 @@ from types import ListType, StringType
 
 from Mailman import mm_cfg
 from Mailman import Utils
+from Mailman.Generator import Generator
+
+try:
+    True, False
+except NameError:
+    True = 1
+    False = 0
 
 COMMASPACE = ', '
 
@@ -197,6 +206,18 @@ class Message(email.Message.Message):
             authors.append(address)
         return authors
 
+    def as_string(self, unixfrom=False):
+        """Return entire formatted message as a string using Mailman.Generator.
+
+	Operates like email.Message.Message.as_string, only
+	using Mailman's Generator class. Only the top headers will get folded.
+        """
+        fp = StringIO()
+        g = Generator(fp, foldheaders=True)
+        g.flatten(self, unixfrom=unixfrom)
+        return fp.getvalue()
+
+
     def get_filename(self, failobj=None):
         """Some MUA have bugs in RFC2231 filename encoding and cause
         Mailman to stop delivery in Scrubber.py (called from ToDigest.py).

Places

File mailman-2.1.4-avoid-headerfolding-python21.diff of Package mailman (Revision 48f355b7d9a048152a3cc3f1abfea815)

Places