From sjoerd at users.sourceforge.net  Sun Jul  3 10:53:31 2005
From: sjoerd at users.sourceforge.net (Sjoerd Mullender)
Date: Sun, 03 Jul 2005 01:53:31 -0700
Subject: [Spambayes-checkins] spambayes/scripts sb_imapfilter.py,1.61,1.62
Message-ID: <E1Dp0EE-0000BQ-WB@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	sb_imapfilter.py 
Log Message:
It seems it is possible that we get an invalid date string from
self.extractTime(), so protect against that.  (I got a string
"19-Jan-2038 03:23:05 +0100" which caused the now protected call to
self.imap_server.append to raise an exception.)


Index: sb_imapfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_imapfilter.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** sb_imapfilter.py	30 May 2005 07:02:11 -0000	1.61
--- sb_imapfilter.py	3 Jul 2005 08:53:28 -0000	1.62
***************
*** 676,681 ****
                            (flags, Time2Internaldate(time.time())),
                            (None, Time2Internaldate(time.time()))]:
!             response = self.imap_server.append(self.folder.name, flgs, tme,
!                                                self.as_string())
              try:
                  self.imap_server.check_response("", response)
--- 676,684 ----
                            (flags, Time2Internaldate(time.time())),
                            (None, Time2Internaldate(time.time()))]:
!             try:
!                 response = self.imap_server.append(self.folder.name, flgs, tme,
!                                                    self.as_string())
!             except BaseIMAP.error:
!                 continue
              try:
                  self.imap_server.check_response("", response)


From anadelonbrin at users.sourceforge.net  Fri Jul  8 05:24:43 2005
From: anadelonbrin at users.sourceforge.net (Tony Meyer)
Date: Thu, 07 Jul 2005 20:24:43 -0700
Subject: [Spambayes-checkins] spambayes/scripts sb_imapfilter.py,1.62,1.63
Message-ID: <E1DqjTn-0001xt-8Y@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	sb_imapfilter.py 
Log Message:
If a folder (e.g. ham_folder) isn't selected, then don't try and expunge it.

Index: sb_imapfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_imapfilter.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** sb_imapfilter.py	3 Jul 2005 08:53:28 -0000	1.62
--- sb_imapfilter.py	8 Jul 2005 03:24:40 -0000	1.63
***************
*** 273,278 ****
                          "unsure_folder",
                          "ham_folder"]:
!                 self.select(options["imap", fol])
!                 self.expunge()
              # Expunge messages from the ham and spam training folders.
              for fol_list in ["ham_train_folders",
--- 273,280 ----
                          "unsure_folder",
                          "ham_folder"]:
!                 folder_name = options["imap", fol]
!                 if folder_name:
!                     self.select(folder_name)
!                     self.expunge()
              # Expunge messages from the ham and spam training folders.
              for fol_list in ["ham_train_folders",