[Spambayes-checkins] spambayes/spambayes hammie.py,1.14,1.15

[Skip Montanaro]

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

Modified Files:
	hammie.py 
Log Message:
use mboxutils.as_string() to more robustly flatten messages (this occurrence
affects sb_filter.py)


Index: hammie.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/hammie.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** hammie.py	5 Feb 2004 08:13:27 -0000	1.14
--- hammie.py	4 May 2004 13:02:08 -0000	1.15
***************
*** 144,148 ****
              del msg[debugheader]
              msg.add_header(debugheader, disp)
!         return msg.as_string(unixfrom=(msg.get_unixfrom() is not None))
  
      def train(self, msg, is_spam, add_header=False):
--- 144,150 ----
              del msg[debugheader]
              msg.add_header(debugheader, disp)
!         result = mboxutils.as_string(msg, unixfrom=(msg.get_unixfrom()
!                                                     is not None))
!         return result
  
      def train(self, msg, is_spam, add_header=False):