[Spambayes-checkins] spambayes/scripts sb_imapfilter.py,1.36,1.37

[Tony Meyer]

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

Modified Files:
	sb_imapfilter.py 
Log Message:
Fix remaining references to the old imap global found by Sjoerd Mullender.

Updated test suit coming soon...

Index: sb_imapfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_imapfilter.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** sb_imapfilter.py	6 Aug 2004 05:23:21 -0000	1.36
--- sb_imapfilter.py	9 Aug 2004 07:01:38 -0000	1.37
***************
*** 205,209 ****
                  # a list of all the deleted messages which we don't do
                  # anything with).
!                 self.imap_server.close()
  
              if folder == "":
--- 205,209 ----
                  # a list of all the deleted messages which we don't do
                  # anything with).
!                 self.close()
  
              if folder == "":
***************
*** 227,231 ****
          try:
              all_folders = self.check_response("list", response)
!         except BadIMAPResponse:
              # We want to keep going, so just print out a warning, and
              # return an empty list.
--- 227,231 ----
          try:
              all_folders = self.check_response("list", response)
!         except BadIMAPResponseError:
              # We want to keep going, so just print out a warning, and
              # return an empty list.
***************
*** 574,579 ****
          multiple_ids = new_id.split()
          for id_to_remove in multiple_ids[:-1]:
!             response = imap.uid("STORE", id_to_remove, "+FLAGS.SILENT",
!                                 "(\\Deleted \\Seen)")
              command = "silently delete and make seen %s" % (id_to_remove,)
              self.imap_server.check_response(command, response)
--- 574,580 ----
          multiple_ids = new_id.split()
          for id_to_remove in multiple_ids[:-1]:
!             response = self.imap_server.uid("STORE", id_to_remove,
!                                             "+FLAGS.SILENT",
!                                             "(\\Deleted \\Seen)")
              command = "silently delete and make seen %s" % (id_to_remove,)
              self.imap_server.check_response(command, response)
***************
*** 598,602 ****
              # ok as long as another message hasn't also arrived).
              if new_id == "":
!                 response = imap.uid("SEARCH", "ALL")
                  data = self.imap_server.check_response("search all",
                                                         response)
--- 599,603 ----
              # ok as long as another message hasn't also arrived).
              if new_id == "":
!                 response = self.imap_server.uid("SEARCH", "ALL")
                  data = self.imap_server.check_response("search all",
                                                         response)