[Spambayes-checkins] spambayes imapfilter.py,1.50,1.51

[Tony Meyer]

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

Modified Files:
	imapfilter.py 
Log Message:
If you didn't use the -p switch to enter your password interactively, imapfilter
would try and get it from the options, but if it wasn't there yet (because you
hadn't done the setup yet), it would crash.  Fix this.

(As reported on the list by Don Chance).

Index: imapfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/imapfilter.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** imapfilter.py	6 Aug 2003 23:04:04 -0000	1.50
--- imapfilter.py	13 Aug 2003 06:36:46 -0000	1.51
***************
*** 722,729 ****
          #   it knows that imap:server will eventually be able to have
          #   multiple values, but for the moment, we just use the first one
!         server = options["imap", "server"][0]
!         username = options["imap", "username"][0]
          if not promptForPass:
!             pwd = options["imap", "password"][0]
      else:
          if not launchUI:
--- 722,735 ----
          #   it knows that imap:server will eventually be able to have
          #   multiple values, but for the moment, we just use the first one
!         server = options["imap", "server"]
!         if len(server) > 0:
!             server = server[0]
!         username = options["imap", "username"]
!         if len(username) > 0:
!             username = username[0]
          if not promptForPass:
!             pwd = options["imap", "password"]
!             if len(pwd) > 0:
!                 pwd = pwd[0]
      else:
          if not launchUI: