[Inteproxy-commits] r9 - trunk

[scm-commit@wald.intevation.org]

Author: jan
Date: 2006-11-16 11:40:02 +0100 (Thu, 16 Nov 2006)
New Revision: 9

Modified:
   trunk/ChangeLog
   trunk/InteProxy.py
Log:
InteProxy.py (inteproxy_version): New. Version string.
(setup_urllib2): Replaced HTTPHandler by ProxyHandler to
make InteProxy use Proxies properly.
(run_server): Print out version at startup.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-11-13 22:21:35 UTC (rev 8)
+++ trunk/ChangeLog	2006-11-16 10:40:02 UTC (rev 9)
@@ -1,3 +1,10 @@
+2006-11-16  Jan-Oliver Wagner  <jan-oliver.wagner at intevation.de>
+
+	* InteProxy.py (inteproxy_version): New. Version string.
+	(setup_urllib2): Replaced HTTPHandler by ProxyHandler to
+	make InteProxy use Proxies properly.
+	(run_server): Print out version at startup.
+
 2006-11-13  Jan-Oliver Wagner  <jan-oliver.wagner at intevation.de>
 
 	* inteproxy.iss: Updated to 0.1.

Modified: trunk/InteProxy.py
===================================================================
--- trunk/InteProxy.py	2006-11-13 22:21:35 UTC (rev 8)
+++ trunk/InteProxy.py	2006-11-16 10:40:02 UTC (rev 9)
@@ -24,6 +24,8 @@
 import Queue
 import socket
 
+inteproxy_version = "0.1.x"
+
 try:
     import pywin.dialogs.login
     windowsystem = "pywin"
@@ -320,8 +322,8 @@
 
 def setup_urllib2():
     auth_handler = urllib2.HTTPBasicAuthHandler(IntePasswordManager())
-    httphandler = urllib2.HTTPHandler()
-    opener = urllib2.build_opener(auth_handler, httphandler)
+    proxyhandler = urllib2.ProxyHandler()
+    opener = urllib2.build_opener(auth_handler, proxyhandler)
     urllib2.install_opener(opener)
 
 
@@ -344,6 +346,7 @@
     if opts.logfile:
         sys.stderr = open(opts.logfile, "a", 0)
 
+    sys.stderr.write("InteProxy Version %s\n" % inteproxy_version)
     sys.stderr.write("[%s] server starting up\n" % log_date_time_string())
 
     httpd = ServerClass(server_address, HandlerClass)