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

[Tony Meyer]

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

Modified Files:
	ImapUI.py 
Log Message:
Fix [ 903905 ] IMAP Configuration Error

(This was meant to have been fixed before, but apparently wasn't).

Index: ImapUI.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/ImapUI.py,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** ImapUI.py	27 Jan 2004 08:37:14 -0000	1.36
--- ImapUI.py	30 Sep 2004 02:02:58 -0000	1.37
***************
*** 44,47 ****
--- 44,48 ----
  import re
  import cgi
+ import types
  
  import UserInterface
***************
*** 208,213 ****
              self._writePostamble()
              return
!         username = options["imap", "username"][0]
!         if username == "":
              content = self._buildBox("Error", None,
                                       """Must specify username first.""")
--- 209,216 ----
              self._writePostamble()
              return
!         username = options["imap", "username"]
!         if isinstance(username, types.TupleType):
!             username = username[0]
!         if not username:
              content = self._buildBox("Error", None,
                                       """Must specify username first.""")
***************
*** 215,218 ****
--- 218,231 ----
              self._writePostamble()
              return
+         if not self.imap_pwd:
+             self.imap_pwd = options["imap", "password"]
+             if isinstance(self.imap_pwd, types.TupleType):
+                 self.imap_pwd = self.imap_pwd[0]
+         if not self.imap_pwd:
+             content = self._buildBox("Error", None,
+                                      """Must specify password first.""")
+             self.write(content)
+             self._writePostamble()
+             return
          self.imap.login(username, self.imap_pwd)
          self.imap_logged_in = True