[Spambayes-checkins] spambayes pop3proxy.py,1.70,1.71

[Tony Meyer]

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

Modified Files:
	pop3proxy.py 
Log Message:
Remove option to launch smtpproxy and always do this.
If you haven't specified a smtp server then nothing will
happen anyway and this is simpler to explain to people.

Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** pop3proxy.py	18 Apr 2003 04:46:28 -0000	1.70
--- pop3proxy.py	18 Apr 2003 05:26:26 -0000	1.71
***************
*** 23,27 ****
                        (default 8880; Browse http://localhost:8880/)
              -b      : Launch a web browser showing the user interface.
-             -s      : Start a SMTPProxy server for training use.
  
          All command line arguments and switches take their default
--- 23,26 ----
***************
*** 1653,1657 ****
  
      runSelfTest = False
-     launchSMTPProxy = False
      for opt, arg in opts:
          if opt == '-h':
--- 1652,1655 ----
***************
*** 1663,1668 ****
          elif opt == '-b':
              state.launchUI = True
-         elif opt == '-s':
-             launchSMTPProxy = True
          elif opt == '-d':   # dbm file
              state.useDB = True
--- 1661,1664 ----
***************
*** 1686,1694 ****
      state.createWorkers()
  
!     if launchSMTPProxy:
!         from smtpproxy import LoadServerInfo, CreateProxies
!         servers, proxyPorts = LoadServerInfo()
!         CreateProxies(servers, proxyPorts, state)
!         LoadServerInfo()
      
      if runSelfTest:
--- 1682,1693 ----
      state.createWorkers()
  
!     # Launch any SMTP proxies.  This was once an option, but
!     # is now always carried out - if the user hasn't specified any
!     # SMTP proxy information in their configuration, then nothing
!     # will happen anyway, and this is much clearer for documentation.
!     from smtpproxy import LoadServerInfo, CreateProxies
!     servers, proxyPorts = LoadServerInfo()
!     CreateProxies(servers, proxyPorts, state)
!     LoadServerInfo()
      
      if runSelfTest: