[Spambayes-checkins] spambayes/scripts sb_imapfilter.py,1.28,1.29

[Tony Meyer]

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

Modified Files:
	sb_imapfilter.py 
Log Message:
If the move_trained_[ham|spam]_to_folder options were used, this would
wipe out the SpamBayes headers.  Fix that.

Update message.py for the newer way that the persistent_use_database option
works.

Index: sb_imapfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_imapfilter.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** sb_imapfilter.py	16 Mar 2004 07:04:31 -0000	1.28
--- sb_imapfilter.py	25 Apr 2004 03:45:30 -0000	1.29
***************
*** 667,670 ****
--- 667,671 ----
              if msg.GetTrained() is None:
                  msg.get_substance()
+                 saved_headers = msg.currentSBHeaders()
                  msg.delSBHeaders()
                  classifier.learn(msg.asTokens(), isSpam)
***************
*** 676,679 ****
--- 677,683 ----
                      move_opt_name = "move_trained_ham_to_folder"
                  if options["imap", move_opt_name] != "":
+                     # We need to restore the SpamBayes headers.
+                     for header, value in saved_headers.items():
+                         msg[header] = value
                      msg.MoveTo(IMAPFolder(options["imap",
                                                    move_opt_name]))