openstack/deb-python-websocket-client
Code Issues Proposed changes

Merge pull request #16 from aluzzardi/fix_querystring

Browse Source 
Don't discard the query string when parsing the URL

- the latest websocket protocol support query parameter. fixed this
This commit is contained in:
liris
2012-04-18 23:40:50 -07:00
parent 13889302cd b8dbd2742a
commit 88beeaefc1
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test_websocket.py
View File

@@ -96,6 +96,12 @@ class WebSocketTest(unittest.TestCase):
self.assertEquals(p[2], "/r") self.assertEquals(p[2], "/r")
self.assertEquals(p[3], True) self.assertEquals(p[3], True)
p = ws._parse_url("wss://www.example.com:8080/r?key=value")
self.assertEquals(p[0], "www.example.com")
self.assertEquals(p[1], 8080)
self.assertEquals(p[2], "/r?key=value")
self.assertEquals(p[3], True)
self.assertRaises(ValueError, ws._parse_url, "http://www.example.com/r") self.assertRaises(ValueError, ws._parse_url, "http://www.example.com/r")
def testWSKey(self): def testWSKey(self):

3
websocket.py
View File

@@ -132,6 +132,9 @@ def _parse_url(url):
else: else:
resource = "/" resource = "/"
if parsed.query:
resource += "?" + parsed.query
return (hostname, port, resource, is_secure) return (hostname, port, resource, is_secure)
def create_connection(url, timeout=None, **options): def create_connection(url, timeout=None, **options):