[Spambayes-checkins] spambayes/spambayes message.py,1.49,1.49.4.1

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10140/spambayes

Modified Files:
      Tag: release_1_0-branch
	message.py 
Log Message:
Backport the sb_server/sb_imapfilter/sb_pop3dnd fix for the 'TypeError'
malformed message problem.

Index: message.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/message.py,v
retrieving revision 1.49
retrieving revision 1.49.4.1
diff -C2 -d -r1.49 -r1.49.4.1
*** message.py	25 Apr 2004 03:45:30 -0000	1.49
--- message.py	10 Jun 2004 05:25:55 -0000	1.49.4.1
***************
*** 277,281 ****
          # \r\n *only*).  imaplib *should* take care of this for us (in the
          # append function), but does not, so we do it here
!         return self._force_CRLF(email.Message.Message.as_string(self, unixfrom))
  
      def modified(self):
--- 277,288 ----
          # \r\n *only*).  imaplib *should* take care of this for us (in the
          # append function), but does not, so we do it here
!         try:
!             return self._force_CRLF(\
!                 email.Message.Message.as_string(self, unixfrom))
!         except TypeError:
!             parts = []
!             for part in self.get_payload():
!                 parts.append(email.Message.Message.as_string(part, unixfrom))
!             return self._force_CRLF("\n".join(parts))
  
      def modified(self):