Fix error on URL to host conversion

It added a '?' to the end of the path, even if there were no query
parameters.

Author: mehaase

tests/test_connection.py

@@ -160,7 +160,6 @@ async def test_serve_non_tcp_listener(nursery):
     with pytest.raises(RuntimeError):
         server.port
     assert server.listeners[0].startswith('MemoryListener(')
-    # TODO add support for arbitrary client streams and test here
 
 
 async def test_serve_multiple_listeners(nursery):
@@ -187,6 +186,10 @@ async def test_client_open(echo_server):
 
 
 async def test_client_open_url(echo_server):
+    url = 'ws://{}:{}{}/path'.format(HOST, echo_server.port, RESOURCE)
+    async with open_websocket_url(url) as conn:
+        assert conn.path == RESOURCE + '/path'
+
     url = 'ws://{}:{}{}?foo=bar'.format(HOST, echo_server.port, RESOURCE)
     async with open_websocket_url(url) as conn:
         assert conn.path == RESOURCE + '?foo=bar'

trio_websocket/__init__.py

@@ -152,8 +152,7 @@ def _url_to_host(url, ssl_context):
         ssl_context = url.scheme == 'wss'
     elif url.scheme == 'ws':
         raise ValueError('SSL context must be None for ws: URL scheme')
-    resource = '{}?{}'.format(url.path, url.query_string)
-    return url.host, url.port, resource, ssl_context
+    return url.host, url.port, url.path_qs, ssl_context
 
 
 async def wrap_client_stream(nursery, stream, host, resource):