[Inteproxy-commits] r13 - trunk

[scm-commit@wald.intevation.org]

Author: jan
Date: 2006-11-16 23:34:55 +0100 (Thu, 16 Nov 2006)
New Revision: 13

Modified:
   trunk/ChangeLog
   trunk/InteProxy.py
Log:
Patch by Thomas Arendsen Hein:
Use proxyconnection module when https_proxy environment variable is set.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-11-16 22:22:02 UTC (rev 12)
+++ trunk/ChangeLog	2006-11-16 22:34:55 UTC (rev 13)
@@ -1,5 +1,10 @@
 2006-11-16  Thomas Arendsen Hein <thomas at intevation.de>
 
+	* InteProxy.py (setup_urllib2): Use proxyconnection module when
+	https_proxy environment variable is set.
+
+2006-11-16  Thomas Arendsen Hein <thomas at intevation.de>
+
 	* proxyconnection.py (ConnectHTTPHandler, ConnectHTTPSHandler):
 	Set proxy via ConnectHTTPHandler/ConnectHTTPSHandler, this fixes
 	redirections and makes setting the proxy easier. Taken from

Modified: trunk/InteProxy.py
===================================================================
--- trunk/InteProxy.py	2006-11-16 22:22:02 UTC (rev 12)
+++ trunk/InteProxy.py	2006-11-16 22:34:55 UTC (rev 13)
@@ -13,6 +13,7 @@
 python InteProxy.py
 """
 
+import os
 import sys
 import optparse
 import traceback
@@ -23,6 +24,7 @@
 import threading
 import Queue
 import socket
+import proxyconnection
 
 inteproxy_version = "0.1.x"
 
@@ -322,8 +324,18 @@
 
 def setup_urllib2():
     auth_handler = urllib2.HTTPBasicAuthHandler(IntePasswordManager())
-    proxyhandler = urllib2.ProxyHandler()
-    opener = urllib2.build_opener(auth_handler, proxyhandler)
+    if os.environ.has_key('https_proxy'):
+        https_proxy = urlparse.urlsplit(os.getenv('https_proxy'))[1]
+        del os.environ['https_proxy']
+        sys.stderr.write("[%s] Using HTTPS proxy: %s\n"
+                         % (log_date_time_string(), https_proxy))
+        opener = urllib2.build_opener(
+            auth_handler,
+            proxyconnection.ConnectHTTPHandler(proxy=https_proxy),
+            proxyconnection.ConnectHTTPSHandler(proxy=https_proxy))
+    else:
+        httphandler = urllib2.HTTPHandler()
+        opener = urllib2.build_opener(auth_handler, httphandler)
     urllib2.install_opener(opener)