From: Kyle Kelley <kyle.kelley@rackspace.com>
Date: Sat, 25 Jan 2014 15:22:10 +0000 (-0700)
Subject: Response of None on failure
X-Git-Tag: v4.0.0b1~35^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cf5f0a0a92622872203141639d03d606e8c644d;p=thirdparty%2Ftornado.git

Response of None on failure
---

diff --git a/docs/overview.rst b/docs/overview.rst
index f066b47d0..229411914 100644
--- a/docs/overview.rst
+++ b/docs/overview.rst
@@ -296,7 +296,7 @@ directory as your Python file, you could render this template with:
             self.render("template.html", title="My title", items=items)
 
 Tornado templates support *control statements* and *expressions*.
-Control statements are surronded by ``{%`` and ``%}``, e.g.,
+Control statements are surrounded by ``{%`` and ``%}``, e.g.,
 ``{% if len(items) > 2 %}``. Expressions are surrounded by ``{{`` and
 ``}}``, e.g., ``{{ items[0] }}``.
 
diff --git a/tornado/test/websocket_test.py b/tornado/test/websocket_test.py
index 87dae7697..dae5d88b5 100644
--- a/tornado/test/websocket_test.py
+++ b/tornado/test/websocket_test.py
@@ -202,7 +202,7 @@ class WebSocketTest(AsyncHTTPTestCase):
 
         response = yield ws.read_message()
 
-        self.assertEqual(response, 'hello')
+        self.assertEqual(response, None)
         ws.close()
         yield self.close_future