Ticket #1774: proxy_take2.patch

twisted\web\client.py

@@ -201 +201 @@
 
     def __init__(self, url, method='GET', postdata=None, headers=None,
                  agent="Twisted PageGetter", timeout=0, cookies=None,
-                 followRedirect=1):
+                 followRedirect=1, proxy=None):
         self.protocol.followRedirect = followRedirect
         self.timeout = timeout
         self.agent = agent
+        self.proxy = proxy
 
         if cookies is None:
             cookies = {}
@@ -236 +237 @@
             self.scheme = scheme
             self.host = host
             self.port = port
-        self.path = path
+        if self.proxy:
+            self.path = "%s://%s:%s%s" % (self.scheme,  
+                                          self.host,  
+                                          self.port,  
+                                          path)
+        else:
+            self.path = path
 
     def buildProtocol(self, addr):
         p = protocol.ClientFactory.buildProtocol(self, addr)
@@ -378 +385 @@
     return scheme, host, port, path
 
 
-def getPage(url, contextFactory=None, *args, **kwargs):
+def getPage(url, contextFactory=None, proxy=None, *args, **kwargs):
     """Download a web page as a string.
 
     Download a page. Return a deferred, which will callback with a
@@ -387 +394 @@
     See HTTPClientFactory to see what extra args can be passed.
     """
     scheme, host, port, path = _parse(url)
+    if proxy:
+        host, port = proxy.split(':')
+        port = int(port)
+        kwargs['proxy'] = proxy
     factory = HTTPClientFactory(url, *args, **kwargs)
     if scheme == 'https':
         from twisted.internet import ssl