Change to_host_port_tuple to use regex and update default port

Author: fredthomsen

hyper/common/util.py

@@ -6,6 +6,7 @@
 General utility functions for use with hyper.
 """
 from hyper.compat import unicode, bytes, imap
+import re
 
 def to_bytestring(element):
     """
@@ -31,17 +32,11 @@ def to_host_port_tuple(host_port_str, default_port=80):
     Converts the given string containing a host and possibly a port
     to a tuple.
     """
-    if ']' in host_port_str:
-        delim = ']:'
+    if re.search("\]:\d+|\.\d{1-3}:\d+|[a-zA-Z0-9-]+:\d+", host_port_str):
+        host, port = host_port_str.rsplit(':', 1)
+        port = int(port)
     else:
-        delim = ':'
-        
-    try:
-        host, port = host_port_str.rsplit(delim, 1)
-    except ValueError:
         host, port = host_port_str, default_port
-    else:
-        port = int(port)
 
     host = host.strip('[]')
 

hyper/http20/connection.py

@@ -68,7 +68,7 @@ def __init__(self, host, port=None, secure=None, window_manager=None, enable_pus
         Creates an HTTP/2 connection to a specific server.
         """
         if port is None:
-            self.host, self.port = to_host_port_tuple(host)
+            self.host, self.port = to_host_port_tuple(host, default_port=443)
         else:
             self.host, self.port = host, port