From: Andrew Plotkin <zgithub@eblong.com>
Date: Sat, 22 Jun 2013 18:03:50 +0000 (-0400)
Subject: Fix issue 829 -- error message is displaying wrong incorrect result.
X-Git-Tag: v3.2.0b1~118^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F831%2Fhead;p=thirdparty%2Ftornado.git

Fix issue 829 -- error message is displaying wrong incorrect result.
---

diff --git a/tornado/web.py b/tornado/web.py
index eade230ef..363c97c44 100644
--- a/tornado/web.py
+++ b/tornado/web.py
@@ -1142,7 +1142,7 @@ class RequestHandler(object):
             elif isinstance(result, Future):
                 if result.done():
                     if result.result() is not None:
-                        raise ValueError('Expected None, got %r' % result)
+                        raise ValueError('Expected None, got %r' % result.result())
                     callback()
                 else:
                     # Delayed import of IOLoop because it's not available