Skip to content
This repository was archived by the owner on Jan 13, 2021. It is now read-only.

Commit 4ec8b83

Browse files
committed
Change http11 and http20 constructors to use new utility function for host and proxy
1 parent 4f23977 commit 4ec8b83

File tree

2 files changed

+4
-22
lines changed

2 files changed

+4
-22
lines changed

hyper/http11/connection.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ class HTTP11Connection(object):
5656
def __init__(self, host, port=None, secure=None, ssl_context=None,
5757
proxy_host=None, proxy_port=None, **kwargs):
5858
if port is None:
59-
try:
60-
self.host, self.port = host.split(':')
61-
self.port = int(self.port)
62-
except ValueError:
63-
self.host, self.port = host, 80
59+
self.host, self.port = to_host_port_tuple(host)
6460
else:
6561
self.host, self.port = host, port
6662

@@ -83,12 +79,7 @@ def __init__(self, host, port=None, secure=None, ssl_context=None,
8379
# Setup proxy details if applicable.
8480
if proxy_host:
8581
if proxy_port is None:
86-
try:
87-
self.proxy_host, self.proxy_port = proxy_host.split(':')
88-
except ValueError:
89-
self.proxy_host, self.proxy_port = proxy_host, 8080
90-
else:
91-
self.proxy_port = int(self.proxy_port)
82+
self.proxy_host, self.proxy_port = to_host_port_tuple(proxy_host, default_port=8080)
9283
else:
9384
self.proxy_host, self.proxy_port = proxy_host, proxy_port
9485
else:

hyper/http20/connection.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,7 @@ def __init__(self, host, port=None, secure=None, window_manager=None, enable_pus
6767
Creates an HTTP/2 connection to a specific server.
6868
"""
6969
if port is None:
70-
try:
71-
self.host, self.port = host.split(':')
72-
self.port = int(self.port)
73-
except ValueError:
74-
self.host, self.port = host, 443
70+
self.host, self.port = to_host_port_tuple(host)
7571
else:
7672
self.host, self.port = host, port
7773

@@ -88,12 +84,7 @@ def __init__(self, host, port=None, secure=None, window_manager=None, enable_pus
8884
# Setup proxy details if applicable.
8985
if proxy_host:
9086
if proxy_port is None:
91-
try:
92-
self.proxy_host, self.proxy_port = proxy_host.split(':')
93-
except ValueError:
94-
self.proxy_host, self.proxy_port = proxy_host, 8080
95-
else:
96-
self.proxy_port = int(self.proxy_port)
87+
self.proxy_host, self.proxy_port = to_host_port_tuple(proxy_host, default_port=8080)
9788
else:
9889
self.proxy_host, self.proxy_port = proxy_host, proxy_port
9990
else:

0 commit comments

Comments
 (0)