minor update

stamparm · stamparm · commit a0f5c3d885d3 · 2010-02-25T13:45:28.000Z
diff --git a/lib/request/connect.py b/lib/request/connect.py
@@ -92,11 +92,10 @@ def getPage(**kwargs):
                     requestMsg += "?%s" % params
     
             elif multipart:
-                proxyHandler = None
-                if not conf.proxy:
-                    if conf.hostname in ('localhost', '127.0.0.1'):
-                        proxyHandler = urllib2.ProxyHandler({})
-                multipartOpener = urllib2.build_opener(*(proxyHandler, multipartpost.MultipartPostHandler) if proxyHandler else multipartpost.MultipartPostHandler)
+                #needed in this form because of potential circle dependency problem (option -> update -> connect -> option)
+                from lib.core.option import proxyHandler
+                
+                multipartOpener = urllib2.build_opener(proxyHandler, multipartpost.MultipartPostHandler)
                 conn = multipartOpener.open(url, multipart)
                 page = conn.read()            
                 responseHeaders = conn.info()
