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

Tony Meyer anadelonbrin at users.sourceforge.net
Thu Apr 17 22:46:30 EDT 2003


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

Modified Files:
	pop3proxy.py 
Log Message:
Remove ability to use the (long depreciated) pop3proxy_port,
pop3proxy_server_name and pop3proxy_server_port options.

If you are *really* slow at updating, this may break your
configuration!

Index: pop3proxy.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/pop3proxy.py,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** pop3proxy.py	4 Apr 2003 01:11:57 -0000	1.69
--- pop3proxy.py	18 Apr 2003 04:46:28 -0000	1.70
***************
*** 1228,1247 ****
              self.logFile = open('_pop3proxy.log', 'wb', 0)
  
-         # Load up the old proxy settings from Options.py / bayescustomize.ini
-         # and give warnings if they're present.   XXX Remove these soon.
          self.servers = []
          self.proxyPorts = []
-         if options.pop3proxy_port != 110 or \
-            options.pop3proxy_server_name != '' or \
-            options.pop3proxy_server_port != 110:
-             print "\n    pop3proxy_port, pop3proxy_server_name and"
-             print "    pop3proxy_server_port are deprecated!  Please use"
-             print "    pop3proxy_servers and pop3proxy_ports instead.\n"
-             self.servers = [(options.pop3proxy_server_name,
-                              options.pop3proxy_server_port)]
-             self.proxyPorts = [options.pop3proxy_port]
  
-         # Load the new proxy settings - these will override the old ones
-         # if both are present.
          if options.pop3proxy_servers:
              for server in options.pop3proxy_servers.split(','):
--- 1228,1234 ----





More information about the Spambayes-checkins mailing list