Update connection constructors and connect methods for proxy support

Author: fredthomsen

hyper/common/connection.py

@@ -40,8 +40,8 @@ class HTTPConnection(object):
         :meth:`get_pushes() <hyper.HTTP20Connection.get_pushes>`).
     :param ssl_context: (optional) A class with custom certificate settings.
         If not provided then hyper's default ``SSLContext`` is used instead.
-    :param proxies: (optional) A dictionary whose keys are the scheme used 
-        (http or https) and the value being the url of the proxy).
+    :param proxy: (optional) The proxy to connect to.  This can be an IP address
+        or a host name and may include a port.
     """
     def __init__(self,
                  host,
@@ -50,15 +50,15 @@ def __init__(self,
                  window_manager=None,
                  enable_push=False,
                  ssl_context=None,
-                 proxies=None,
+                 proxy=None,
                  **kwargs):
 
         self._host = host
         self._port = port
-        self._h1_kwargs = {'secure': secure, 'ssl_context': ssl_context, 'proxies': proxies }
+        self._h1_kwargs = {'secure': secure, 'ssl_context': ssl_context, 'proxy': proxy }
         self._h2_kwargs = {
             'window_manager': window_manager, 'enable_push': enable_push,
-            'secure': secure, 'ssl_context': ssl_context, 'proxies': proxies
+            'secure': secure, 'ssl_context': ssl_context, 'proxy': proxy
         }
 
         # Add any unexpected kwargs to both dictionaries.

hyper/http11/connection.py

@@ -47,11 +47,11 @@ class HTTP11Connection(object):
         port 443.
     :param ssl_context: (optional) A class with custom certificate settings.
         If not provided then hyper's default ``SSLContext`` is used instead.
-    :param proxies: (optional) A dictionary whose keys are the scheme used 
-        (http or https) and the value being the url of the proxy).
+    :param proxy: (optional) The proxy to connect to.  This can be an IP address
+        or a host name and may include a port.
     """
     def __init__(self, host, port=None, secure=None, ssl_context=None, 
-                 proxies=None, **kwargs):
+                 proxy=None, **kwargs):
         if port is None:
             try:
                 self.host, self.port = host.split(':')
@@ -75,8 +75,17 @@ def __init__(self, host, port=None, secure=None, ssl_context=None,
         self._send_http_upgrade = not self.secure
 
         self.ssl_context = ssl_context
-        self.proxies = proxies
         self._sock = None
+       
+        if proxy:
+            self.proxy_host, self.proxy_port = proxy.split(':')
+            if(self.proxy_port):
+                self.proxy_port = int(self.proxy_port)
+            else:
+                self.proxy_port = 8080
+        else:
+            self.proxy_host = None
+            self.proxy_port = None
 
         #: The size of the in-memory buffer used to store data from the
         #: network. This is used as a performance optimisation. Increase buffer
@@ -96,11 +105,16 @@ def connect(self):
         :returns: Nothing.
         """
         if self._sock is None:
-            sock = socket.create_connection((self.host, self.port), 5)
+            if not self.proxy_host:
+                host = self.host
+            else:
+                port = self.proxy_host
+                
+            sock = socket.create_connection((host, port), 5)
             proto = None
 
             if self.secure:
-                sock, proto = wrap_socket(sock, self.host, self.ssl_context)
+                sock, proto = wrap_socket(sock, host, self.ssl_context)
 
             log.debug("Selected protocol: %s", proto)
             sock = BufferedSocket(sock, self.network_buffer_size)

hyper/http20/connection.py

@@ -56,11 +56,11 @@ class HTTP20Connection(object):
         :meth:`get_pushes() <hyper.HTTP20Connection.get_pushes>`).
     :param ssl_context: (optional) A class with custom certificate settings.
         If not provided then hyper's default ``SSLContext`` is used instead.
-    :param proxies: (optional) A dictionary whose keys are the scheme used 
+    :param proxy: (optional) A dictionary whose keys are the scheme used 
         (http or https) and the value being the url of the proxy).
     """
     def __init__(self, host, port=None, secure=None, window_manager=None, enable_push=False,
-                 ssl_context=None, proxies=None, **kwargs):
+                 ssl_context=None, proxy=None, **kwargs):
         """
         Creates an HTTP/2 connection to a specific server.
         """
@@ -82,7 +82,16 @@ def __init__(self, host, port=None, secure=None, window_manager=None, enable_pus
 
         self._enable_push = enable_push
         self.ssl_context = ssl_context
-        self.proxies = proxies
+
+        if proxy:
+            self.proxy_host, self.proxy_port = proxy.split(':')
+            if(self.proxy_port):
+                self.proxy_port = int(self.proxy_port)
+            else:
+                self.proxy_port = 8080
+        else:
+            self.proxy_host = None
+            self.proxy_port = None
 
         #: The size of the in-memory buffer used to store data from the
         #: network. This is used as a performance optimisation. Increase buffer
@@ -225,10 +234,15 @@ def connect(self):
         :returns: Nothing.
         """
         if self._sock is None:
-            sock = socket.create_connection((self.host, self.port), 5)
+            if not self.proxy_host:
+                host = self.host
+            else:
+                port = self.proxy_host
+
+            sock = socket.create_connection((host, port), 5)
 
             if self.secure:
-                sock, proto = wrap_socket(sock, self.host, self.ssl_context)
+                sock, proto = wrap_socket(sock, host, self.ssl_context)
             else:
                 proto = H2C_PROTOCOL