Rename self.client to self.request, in preparation for merging pull

request #72. The standard Python SocketServer/BaseRequestHandler
requires this name.

2 files changed, 5 insertions, 5 deletions

diff --git a/tests/echo.py b/tests/echo.py
index 1d46d50..6ad0651 100755
--- a/tests/echo.py
+++ b/tests/echo.py
@@ -28,21 +28,21 @@ class WebSocketEcho(WebSocketServer):
         cqueue = []
         c_pend = 0
         cpartial = ""
-        rlist = [self.client]
+        rlist = [self.request]
 
         while True:
             wlist = []
 
-            if cqueue or c_pend: wlist.append(self.client)
+            if cqueue or c_pend: wlist.append(self.request)
             ins, outs, excepts = select.select(rlist, wlist, [], 1)
             if excepts: raise Exception("Socket exception")
 
-            if self.client in outs:
+            if self.request in outs:
                 # Send queued target data to the client
                 c_pend = self.send_frames(cqueue)
                 cqueue = []
 
-            if self.client in ins:
+            if self.request in ins:
                 # Receive client data, decode it, and send it back
                 frames, closed = self.recv_frames()
                 cqueue.extend(frames)
diff --git a/tests/load.py b/tests/load.py
index e1354c9..f142fa1 100755
--- a/tests/load.py
+++ b/tests/load.py
@@ -34,7 +34,7 @@ class WebSocketLoad(WebSocketServer):
         self.recv_cnt = 0
 
         try:
-            self.responder(self.client)
+            self.responder(self.request)
         except:
             print "accumulated errors:", self.errors
             self.errors = 0