From: Alexander Karpinsky <homm86@gmail.com>
Date: Fri, 27 Jan 2017 01:16:50 +0000 (+0300)
Subject: Merge branch 'master' into break-circrefs
X-Git-Tag: v4.5.0~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1936%2Fhead;p=thirdparty%2Ftornado.git

Merge branch 'master' into break-circrefs
---

4f353454a692d9203ba7f9555af88d1806275e1e
diff --cc tornado/gen.py
index 14798ae2f,d7df3b52f..8e6a5940d
--- a/tornado/gen.py
+++ b/tornado/gen.py
@@@ -294,8 -314,7 +314,8 @@@ def _make_coroutine_wrapper(func, repla
                  except Exception:
                      future.set_exc_info(sys.exc_info())
                  else:
-                     Runner(result, future, yielded)
+                     _futures_to_runners[future] = Runner(result, future, yielded)
 +                yielded = None
                  try:
                      return future
                  finally:
diff --cc tornado/util.py
index de0b2e5b0,d0f83d1ff..186995f36
--- a/tornado/util.py
+++ b/tornado/util.py
@@@ -171,15 -193,7 +193,11 @@@ def exec_in(code, glob, loc=None)
  if PY3:
      exec("""
  def raise_exc_info(exc_info):
 -    raise exc_info[1].with_traceback(exc_info[2])
 +    try:
 +        raise exc_info[1].with_traceback(exc_info[2])
 +    finally:
 +        exc_info = None
 +
- def exec_in(code, glob, loc=None):
-     if isinstance(code, str):
-         code = compile(code, '<string>', 'exec', dont_inherit=True)
-     exec(code, glob, loc)
  """)
  else:
      exec("""