[Spambayes-checkins] spambayes/scripts sb_imapfilter.py,1.11,1.12

[Tony Meyer]

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

Modified Files:
	sb_imapfilter.py 
Log Message:
Some browsers don't return after webbrowser.open, so just
hang if we try to launch the UI.  For those people, if imapfilter
is run without the -c -t or -b switches, then just serve the interface
(they can manually open the browser to the right place).

Index: sb_imapfilter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/scripts/sb_imapfilter.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** sb_imapfilter.py	3 Oct 2003 02:59:40 -0000	1.11
--- sb_imapfilter.py	3 Oct 2003 06:02:47 -0000	1.12
***************
*** 738,751 ****
      print "and engine %s.\n" % (get_version_string(),)
  
-     if not (doClassify or doTrain or launchUI):
-         print "-b, -c, or -t operands must be specified."
-         print "Please use the -h operand for help."
-         sys.exit()
- 
      if (launchUI and (doClassify or doTrain)):
!         print """
! -b option is exclusive with -c and -t options.
  The user interface will be launched, but no classification
! or training will be performed."""
  
      bdbname = os.path.expanduser(bdbname)
--- 738,746 ----
      print "and engine %s.\n" % (get_version_string(),)
  
      if (launchUI and (doClassify or doTrain)):
!         print """-b option is exclusive with -c and -t options.
  The user interface will be launched, but no classification
! or training will be performed.
! """
  
      bdbname = os.path.expanduser(bdbname)
***************
*** 794,798 ****
  
      # Web interface
!     if launchUI:
          if server != "":
              imap = IMAPSession(server, port, imapDebug, doExpunge)
--- 789,793 ----
  
      # Web interface
!     if not (doClassify or doTrain) or launchUI:
          if server != "":
              imap = IMAPSession(server, port, imapDebug, doExpunge)