[Spambayes-checkins] spambayes/spambayes FileCorpus.py,1.16,1.17

Tony Meyer anadelonbrin at users.sourceforge.net
Wed Dec 22 00:10:24 CET 2004


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

Modified Files:
	FileCorpus.py 
Log Message:
Don't use the strict keyword arg as it is deprecated (we are passing the default value,
 anyway).

Index: FileCorpus.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/FileCorpus.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** FileCorpus.py	19 Jul 2004 09:55:21 -0000	1.16
--- FileCorpus.py	21 Dec 2004 23:10:21 -0000	1.17
***************
*** 273,277 ****
  
          # We parse the content into a generic email.Message object.
!         msg = email.message_from_string(payload, strict=False)
  
          # And then we set ourselves to be equal to it.
--- 273,277 ----
  
          # We parse the content into a generic email.Message object.
!         msg = email.message_from_string(payload)
  
          # And then we set ourselves to be equal to it.
***************
*** 347,352 ****
          '''Create a message object from a filename in a directory'''
          if content:
!             msg = email.message_from_string(content, _class=FileMessage,
!                                             strict=False)
              msg.file_name = key
              msg.directory = directory
--- 347,351 ----
          '''Create a message object from a filename in a directory'''
          if content:
!             msg = email.message_from_string(content, _class=FileMessage)
              msg.file_name = key
              msg.directory = directory
***************
*** 380,385 ****
          if content:
              msg = email.message_from_string(content,
!                                             _class=GzipFileMessage,
!                                             strict=False)
              msg.file_name = key
              msg.directory = directory
--- 379,383 ----
          if content:
              msg = email.message_from_string(content,
!                                             _class=GzipFileMessage)
              msg.file_name = key
              msg.directory = directory



More information about the Spambayes-checkins mailing list