]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
gen: handle None in convert_yielded 1716/head
authorAntoine Pietri <antoine.pietri1@gmail.com>
Mon, 9 May 2016 11:08:07 +0000 (11:08 +0000)
committerAntoine Pietri <antoine.pietri1@gmail.com>
Mon, 9 May 2016 11:08:07 +0000 (11:08 +0000)
tornado/gen.py

index 7ed8ba87707771a176090ccb99a590efb156078f..2f750624f5479582e0e9cc0a88664ddfd19466e6 100644 (file)
@@ -1215,7 +1215,9 @@ def convert_yielded(yielded):
     .. versionadded:: 4.1
     """
     # 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)
     elif is_future(yielded):
         return yielded