Update for change in websocket-client API, update docs, make port of client and server match

Readme.md

@@ -8,3 +8,4 @@ For server (Node.js) - install it with npm
 
 For client (Java App) - go to the client folder and type 'mvn install'. make sure you install maven before proceed.  
 
+For client (Python 2.7 App) - install dependencies with `pip install -r requirements.txt` in this directory, then execute `python client.py` in this directory.

client.py

@@ -3,6 +3,8 @@
 """
 client.py
 
+Python 2.7.x
+
 Based heavily on:
  - https://github.com/mtah/python-websocket/blob/master/examples/echo.py
  - http://stackoverflow.com/a/7586302/316044
@@ -41,18 +43,17 @@ def __init__(self, server, port):
         resp  = conn.getresponse() 
         hskey = resp.read().split(':')[0]
 
-        self.ws = websocket.WebSocket(
+        self.ws = websocket.WebSocketApp(
                         'ws://'+server+':'+str(port)+'/socket.io/1/websocket/'+hskey,
-                        onopen   = self._onopen,
-                        onmessage = self._onmessage,
-                        onclose = self._onclose,
-                        onerror = self._onerror)
+                        on_open   = self._onopen,
+                        on_message = self._onmessage,
+                        on_close = self._onclose,
+                        on_error = self._onerror)
         self.state = Client.DISCONNECTED
 
 
     def _onopen(self):
         self.state = Client.CONNECTED
-
         Client.addMessage("open")
 
         self.heartbeat()
@@ -150,7 +151,7 @@ def processChat():
 if __name__ == '__main__':
 
     parser = argparse.ArgumentParser(description="Load tester for socket.io applications (customized for ROAR)")
-    parser.add_argument('-p', '--port', action='store', default=8888)
+    parser.add_argument('-p', '--port', action='store', default=8080)
     parser.add_argument('-c', '--concurrency', type=int, default=1)
     parser.add_argument('-C', '--chat',metavar="MSGS_PER_MIN_CLIENT", default=0)
     parser.add_argument('server')

requirements.txt

@@ -0,0 +1,3 @@
+six==1.10.0
+websocket-client==0.35.0
+wheel==0.26.0