Skip to content

Commit

Permalink
Merge pull request tornadoweb#1281 from nordaux/master
Browse files Browse the repository at this point in the history
Fixed error that the web.asynchronous doesn't complete python3 concurrent.Futures
  • Loading branch information
bdarnell committed Dec 18, 2014
2 parents ebc59b4 + 683d422 commit 32e82f8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tornado/web.py
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,7 @@ def wrapper(self, *args, **kwargs):
with stack_context.ExceptionStackContext(
self._stack_context_handle_exception):
result = method(self, *args, **kwargs)
if isinstance(result, Future):
if is_future(result):
# If @asynchronous is used with @gen.coroutine, (but
# not @gen.engine), we can automatically finish the
# request when the future resolves. Additionally,
Expand Down

0 comments on commit 32e82f8

Please sign in to comment.