[Spambayes-checkins] spambayes/spambayes Version.py, 1.31.4.2, 1.31.4.3

[Tony Meyer]

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

Modified Files:
      Tag: release_1_0-branch
	Version.py 
Log Message:
Backport:

For proxy handler for version checking, the proxy port needs to be an integer, not a string.

Index: Version.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/spambayes/Version.py,v
retrieving revision 1.31.4.2
retrieving revision 1.31.4.3
diff -C2 -d -r1.31.4.2 -r1.31.4.3
*** Version.py	8 Jul 2004 23:51:24 -0000	1.31.4.2
--- Version.py	9 Nov 2004 22:41:13 -0000	1.31.4.3
***************
*** 134,144 ****
          if ':' in server:
              server, port = server.split(':', 1)
          else:
              port = 8080
!         username = options["globals", "proxy_username"]
!         password = options["globals", "proxy_password"]
          proxy_support = urllib2.ProxyHandler({"http" :
!                                               "http://%s:%s@%s:%d" % \
!                                               (username, password, server,
                                                 port)})
          opener = urllib2.build_opener(proxy_support, urllib2.HTTPHandler)
--- 134,149 ----
          if ':' in server:
              server, port = server.split(':', 1)
+             port = int(port)
          else:
              port = 8080
!         if options["globals", "proxy_username"]:
!             user_pass_string = "%s:%s" % \
!                                (options["globals", "proxy_username"],
!                                 options["globals", "proxy_password"])
!         else:
!             user_pass_string = ""
          proxy_support = urllib2.ProxyHandler({"http" :
!                                               "http://%s@%s:%d" % \
!                                               (user_pass_string, server,
                                                 port)})
          opener = urllib2.build_opener(proxy_support, urllib2.HTTPHandler)