[Spambayes-checkins] spambayes/spambayes ImapUI.py,1.20,1.21

[Tony Meyer]

Update of /cvsroot/spambayes/spambayes/spambayes
In directory sc8-pr-cvs1:/tmp/cvs-serv31504/spambayes

Modified Files:
	ImapUI.py 
Log Message:
Fix a bug reported on the list by Matt Stegman, where trying to
view imap folders before restarting would cause a traceback.

Index: ImapUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ImapUI.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ImapUI.py	24 Sep 2003 05:28:53 -0000	1.20
--- ImapUI.py	28 Sep 2003 23:55:26 -0000	1.21
***************
*** 45,49 ****
  
  import UserInterface
! from Options import options, optionsPathname
  
  # These are the options that will be offered on the configuration page.
--- 45,49 ----
  
  import UserInterface
! from spambayes.Options import options, optionsPathname
  
  # These are the options that will be offered on the configuration page.
***************
*** 107,111 ****
  class IMAPUserInterface(UserInterface.UserInterface):
      """Serves the HTML user interface for the proxies."""
!     def __init__(self, cls, imap, pwd):
          global parm_map
          # Only offer SSL if it is available
--- 107,111 ----
  class IMAPUserInterface(UserInterface.UserInterface):
      """Serves the HTML user interface for the proxies."""
!     def __init__(self, cls, imap, pwd, imap_session_class):
          global parm_map
          # Only offer SSL if it is available
***************
*** 122,125 ****
--- 122,126 ----
          self.imap_logged_in = False
          self.app_for_version = "IMAP Filter"
+         self.imap_session_class = imap_session_class
  
      def onHome(self):
***************
*** 195,199 ****
                  else:
                      port = 143
!             imap = IMAPSession(server, port)
          if self.imap is None:
              content = self._buildBox("Error", None,
--- 196,200 ----
                  else:
                      port = 143
!             imap = self.imap_session_class(server, port)
          if self.imap is None:
              content = self._buildBox("Error", None,