Fix syntax errors and import issues

Author: fredthomsen

hyper/cli.py

@@ -17,6 +17,7 @@
 from hyper import HTTPConnection, HTTP20Connection
 from hyper import __version__
 from hyper.compat import is_py2, urlencode, urlsplit, write_to_stdout
+from hyper.common.util import to_host_port_tuple
 
 
 log = logging.getLogger('hyper')

hyper/common/util.py

@@ -26,7 +26,7 @@ def to_bytestring_tuple(*x):
     """
     return tuple(imap(to_bytestring, x))
 
-def to_host_port_tuple(host_port_str, default_port=80)
+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.
@@ -40,4 +40,4 @@ def to_host_port_tuple(host_port_str, default_port=80)
 
     host = host.strip('[]')
 
-    return tuple(host, port)
+    return ((host, port))

hyper/http11/connection.py

@@ -15,7 +15,7 @@
 from ..common.bufsocket import BufferedSocket
 from ..common.exceptions import TLSUpgrade, HTTPUpgrade
 from ..common.headers import HTTPHeaderMap
-from ..common.util import to_bytestring
+from ..common.util import to_bytestring, to_host_port_tuple
 from ..compat import bytes
 
 from ..packages.hyperframe.frame import SettingsFrame

hyper/http20/connection.py

@@ -9,6 +9,7 @@
 from ..common.exceptions import ConnectionResetError
 from ..common.bufsocket import BufferedSocket
 from ..common.headers import HTTPHeaderMap
+from ..common.util import to_host_port_tuple
 from ..packages.hyperframe.frame import (
     FRAMES, DataFrame, HeadersFrame, PushPromiseFrame, RstStreamFrame,
     SettingsFrame, Frame, WindowUpdateFrame, GoAwayFrame, PingFrame,