From: Antoine Pietri <antoine.pietri1@gmail.com>
Date: Mon, 9 May 2016 11:08:07 +0000 (+0000)
Subject: gen: handle None in convert_yielded
X-Git-Tag: v4.5.0~21^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=447bf2e06b99c26c1a589e412f6f0c4246ad0b52;p=thirdparty%2Ftornado.git

gen: handle None in convert_yielded
---

diff --git a/tornado/gen.py b/tornado/gen.py
index 7ed8ba877..2f750624f 100644
--- a/tornado/gen.py
+++ b/tornado/gen.py
@@ -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