Add proxy port keyword parameter and update tests accordingly

Author: fredthomsen

hyper/common/connection.py

@@ -40,8 +40,10 @@ 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 proxy: (optional) The proxy to connect to.  This can be an IP address
+    :param proxy_host: (optional) The proxy to connect to.  This can be an IP address
         or a host name and may include a port.
+    :param proxy_port: (optional) The proxy port to connect to. If not provided 
+        and one also isn't provided in the ``proxy`` parameter, defaults to 8080.
     """
     def __init__(self,
                  host,
@@ -50,15 +52,16 @@ def __init__(self,
                  window_manager=None,
                  enable_push=False,
                  ssl_context=None,
-                 proxy=None,
+                 proxy_host=None,
+                 proxy_port=None,
                  **kwargs):
 
         self._host = host
         self._port = port
-        self._h1_kwargs = {'secure': secure, 'ssl_context': ssl_context, 'proxy': proxy }
+        self._h1_kwargs = {'secure': secure, 'ssl_context': ssl_context, 'proxy_host': proxy_host, 'proxy_port': proxy_port }
         self._h2_kwargs = {
             'window_manager': window_manager, 'enable_push': enable_push,
-            'secure': secure, 'ssl_context': ssl_context, 'proxy': proxy
+            'secure': secure, 'ssl_context': ssl_context, 'proxy_host': proxy_host, 'proxy_port': proxy_port
         }
 
         # Add any unexpected kwargs to both dictionaries.

hyper/http11/connection.py

@@ -47,11 +47,13 @@ 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 proxy: (optional) The proxy to connect to.  This can be an IP address
+    :param proxy_host: (optional) The proxy to connect to.  This can be an IP address
         or a host name and may include a port.
+    :param proxy_port: (optional) The proxy port to connect to. If not provided 
+        and one also isn't provided in the ``proxy`` parameter, defaults to 8080.
     """
     def __init__(self, host, port=None, secure=None, ssl_context=None, 
-                 proxy=None, **kwargs):
+                 proxy_host=None, proxy_port=None, **kwargs):
         if port is None:
             try:
                 self.host, self.port = host.split(':')
@@ -76,17 +78,19 @@ def __init__(self, host, port=None, secure=None, ssl_context=None,
 
         self.ssl_context = ssl_context
         self._sock = None
-       
-        if proxy:
-            if(':' in proxy):
-                self.proxy_host, self.proxy_port = proxy.split(':')
-                self.proxy_port = int(self.proxy_port)
+
+        # Setup proxy details if applicable.
+        if proxy_host:
+            if proxy_port is None:
+                try:
+                    self.proxy_host, self.proxy_port = proxy_host.split(':')
+                    self.proxy_port = int(self.proxy_port)
+                except ValueError:
+                    self.proxy_host, self.proxy_port = proxy_host, 8080
             else:
-                self.proxy_host = proxy
-                self.proxy_port = 8080
+                self.proxy_host, self.proxy_port = proxy_host, proxy_port
         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

hyper/http20/connection.py

@@ -56,11 +56,13 @@ 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 proxy: (optional) A dictionary whose keys are the scheme used 
-        (http or https) and the value being the url of the proxy).
+    :param proxy_host: (optional) The proxy to connect to.  This can be an IP address
+        or a host name and may include a port.
+    :param proxy_port: (optional) The proxy port to connect to. If not provided 
+        and one also isn't provided in the ``proxy`` parameter, defaults to 8080.
     """
     def __init__(self, host, port=None, secure=None, window_manager=None, enable_push=False,
-                 ssl_context=None, proxy=None, **kwargs):
+                 ssl_context=None, proxy_host=None, proxy_port=None, **kwargs):
         """
         Creates an HTTP/2 connection to a specific server.
         """
@@ -83,15 +85,18 @@ def __init__(self, host, port=None, secure=None, window_manager=None, enable_pus
         self._enable_push = enable_push
         self.ssl_context = ssl_context
 
-        if proxy:
-            self.proxy_host, self.proxy_port = proxy.split(':')
-            if(self.proxy_port):
-                self.proxy_port = int(self.proxy_port)
+        # Setup proxy details if applicable.
+        if proxy_host:
+            if proxy_port is None:
+                try:
+                    self.proxy_host, self.proxy_port = proxy_host.split(':')
+                    self.proxy_port = int(self.proxy_port)
+                except ValueError:
+                    self.proxy_host, self.proxy_port = proxy_host, 8080
             else:
-                self.proxy_port = 8080
+                self.proxy_host, self.proxy_port = proxy_host, proxy_port
         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

test/server.py

@@ -137,7 +137,11 @@ class SocketLevelTest(object):
     def set_up(self, secure=True, proxy=False):
         self.host = None
         self.port = None
+
         self.proxy = proxy
+        self.proxy_host = None
+        self.proxy_port = None
+
         self.secure = secure if not proxy else False
 
         self.server_thread = None
@@ -185,9 +189,9 @@ def _proxy_socket_handler(tx_sock, rx_sock):
 
     def get_connection(self):
         if self.h2:
-            return HTTP20Connection(self.host, self.port, self.secure, proxy=':'.join([self.proxy_host, self.proxy_port]) if self.proxy else None)
+            return HTTP20Connection(self.host, self.port, self.secure, proxy_host=self.proxy_host, proxy_port=self.proxy_port)
         else:
-            return HTTP11Connection(self.host, self.port, self.secure, proxy=':'.join([self.proxy_host, self.proxy_port]) if self.proxy else None)
+            return HTTP11Connection(self.host, self.port, self.secure, proxy_host=self.proxy_host, proxy_port=self.proxy_port)
 
     def get_encoder(self):
         """

test/test_abstraction.py

@@ -8,28 +8,30 @@ class TestHTTPConnection(object):
     def test_h1_kwargs(self):
         c = HTTPConnection(
             'test', 443, secure=False, window_manager=True, enable_push=True,
-            ssl_context=False, proxy=False, other_kwarg=True
+            ssl_context=False, proxy_host=False, proxy_port=False, other_kwarg=True
         )
 
         assert c._h1_kwargs == {
             'secure': False,
             'ssl_context': False,
-            'proxy': False,
+            'proxy_host': False,
+            'proxy_port': False,
             'other_kwarg': True,
         }
 
     def test_h2_kwargs(self):
         c = HTTPConnection(
             'test', 443, secure=False, window_manager=True, enable_push=True,
-            ssl_context=True, proxy=False, other_kwarg=True
+            ssl_context=True, proxy_host=False, proxy_port=False, other_kwarg=True
         )
 
         assert c._h2_kwargs == {
             'window_manager': True,
             'enable_push': True,
             'secure': False,
             'ssl_context': True,
-            'proxy': False,
+            'proxy_host': False,
+            'proxy_port': False,
             'other_kwarg': True,
         }
 

test/test_http11.py

@@ -44,7 +44,6 @@ def test_initialization_no_port(self):
         assert c.port == 80
         assert not c.secure
         assert not c.proxy_host
-        assert not c.proxy_port
 
     def test_initialization_inline_port(self):
         c = HTTP11Connection('httpbin.org:443')
@@ -53,7 +52,6 @@ def test_initialization_inline_port(self):
         assert c.port == 443
         assert c.secure
         assert not c.proxy_host
-        assert not c.proxy_port
 
     def test_initialization_separate_port(self):
         c = HTTP11Connection('localhost', 8080)
@@ -62,7 +60,6 @@ def test_initialization_separate_port(self):
         assert c.port == 8080
         assert not c.secure
         assert not c.proxy_host
-        assert not c.proxy_port
 
     def test_can_override_security(self):
         c = HTTP11Connection('localhost', 443, secure=False)
@@ -71,26 +68,35 @@ def test_can_override_security(self):
         assert c.port == 443
         assert not c.secure
         assert not c.proxy_host
-        assert not c.proxy_port
 
     def test_initialization_proxy(self):
-        c = HTTP11Connection('httpbin.org', proxy='localhost')
+        c = HTTP11Connection('httpbin.org', proxy_host='localhost')
 
         assert c.host == 'httpbin.org'
         assert c.port == 80
         assert not c.secure
         assert c.proxy_host == 'localhost'
         assert c.proxy_port == 8080
 
-    def test_initialization_proxy_with_port(self):
-        c = HTTP11Connection('httpbin.org', proxy='localhost:8443')
+    def test_initialization_proxy_with_inline_port(self):
+        c = HTTP11Connection('httpbin.org', proxy_host='localhost:8443')
 
         assert c.host == 'httpbin.org'
         assert c.port == 80
         assert not c.secure
         assert c.proxy_host == 'localhost'
         assert c.proxy_port == 8443
 
+    def test_initialization_proxy_with_separate_port(self):
+        c = HTTP11Connection('httpbin.org', proxy_host='localhost', proxy_port=8443)
+
+        assert c.host == 'httpbin.org'
+        assert c.port == 80
+        assert not c.secure
+        assert c.proxy_host == 'localhost'
+        assert c.proxy_port == 8443
+
+
     def test_basic_request(self):
         c = HTTP11Connection('httpbin.org')
         c._sock = sock = DummySocket()

test/test_hyper.py

@@ -41,11 +41,25 @@ def test_connections_accept_hosts_and_ports(self):
         c = HTTP20Connection(host='www.google.com', port=8080)
         assert c.host =='www.google.com'
         assert c.port == 8080
+        assert c.proxy_host == None
 
     def test_connections_can_parse_hosts_and_ports(self):
         c = HTTP20Connection('www.google.com:8080')
         assert c.host == 'www.google.com'
         assert c.port == 8080
+        assert c.proxy_host == None
+
+    def test_connections_accept_proxy_hosts_and_ports(self):
+        c = HTTP20Connection('www.google.com', proxy_host='localhost:8443')
+        assert c.host == 'www.google.com'
+        assert c.proxy_host == 'localhost'
+        assert c.proxy_port == 8443
+
+    def test_connections_can_parse_proxy_hosts_and_ports(self):
+        c = HTTP20Connection('www.google.com', proxy_host='localhost', proxy_port=8443)
+        assert c.host == 'www.google.com'
+        assert c.proxy_host == 'localhost'
+        assert c.proxy_port == 8443
 
     def test_putrequest_establishes_new_stream(self):
         c = HTTP20Connection("www.google.com")