From b53895c8f65726e950d13c0b983763a00d176098 Mon Sep 17 00:00:00 2001 From: Trey Date: Tue, 17 Aug 2010 10:03:32 -0400 Subject: [PATCH 1/2] position always showed true from the +1 and len(delimiter), now it checks first if it was a hit then modifies position --- websocket.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/websocket.py b/websocket.py index 7ff057d..615cdca 100644 --- a/websocket.py +++ b/websocket.py @@ -154,7 +154,9 @@ def write(self, data): def _read_until(self, delimiter, callback): self._read_buffer += self.recv(4096) - pos = self._read_buffer.find(delimiter)+len(delimiter)+1 + pos = self._read_buffer.find(delimiter) + if pos >= 0: + pos += len(delimiter)+1 if pos > 0: data = self._read_buffer[:pos] self._read_buffer = self._read_buffer[pos:] From 2a55160712a8ba252eef48577549ff9caa86db62 Mon Sep 17 00:00:00 2001 From: Trey Date: Tue, 17 Aug 2010 10:16:31 -0400 Subject: [PATCH 2/2] adding the scheme 'ws' to urllib so that urlparse works. --- websocket.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/websocket.py b/websocket.py index 615cdca..a68b342 100644 --- a/websocket.py +++ b/websocket.py @@ -15,6 +15,9 @@ import sys, re, urlparse, socket, asyncore +urlparse.uses_netloc.append("ws") +urlparse.uses_fragment.append("ws") + class WebSocket(object): def __init__(self, url, **kwargs): self.host, self.port, self.resource, self.secure = WebSocket._parse_url(url)