Rooba
/
tornado
mirror of https://github.com/tornadoweb/tornado.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1716 from seirl/master 

gen: handle None in convert_yielded
This commit is contained in:
Ben Darnell 2017-03-26 11:46:00 -04:00 committed by GitHub
parent 62d1c62021 447bf2e06b
commit 95e9ef9fbf
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tornado/gen.py
View File

@ -1249,7 +1249,9 @@ def convert_yielded(yielded):
.. versionadded:: 4.1 .. versionadded:: 4.1
""" """
# Lists and dicts containing YieldPoints were handled earlier. # Lists and dicts containing YieldPoints were handled earlier.
if isinstance(yielded, (list, dict)): if yielded is None:
return moment
elif isinstance(yielded, (list, dict)):
return multi(yielded) return multi(yielded)
elif is_future(yielded): elif is_future(yielded):
return yielded return yielded