From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 25 Apr 2011 06:13:13 +0000 (-0700)
Subject: Add **kwargs to WebSocketHandler.__init__
X-Git-Tag: v2.0.0~98
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8faecd76fdbc09218657a53d5a37f56f02b16c7;p=thirdparty%2Ftornado.git

Add **kwargs to WebSocketHandler.__init__

Closes #250.
---

diff --git a/tornado/websocket.py b/tornado/websocket.py
index 8e4308765..14073bd47 100644
--- a/tornado/websocket.py
+++ b/tornado/websocket.py
@@ -66,8 +66,9 @@ class WebSocketHandler(tornado.web.RequestHandler):
 
     This script pops up an alert box that says "You said: Hello, world".
     """
-    def __init__(self, application, request):
-        tornado.web.RequestHandler.__init__(self, application, request)
+    def __init__(self, application, request, **kwargs):
+        tornado.web.RequestHandler.__init__(self, application, request,
+                                            **kwargs)
         self.stream = request.connection.stream
         self.client_terminated = False
         self._waiting = None