From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 2 Dec 2018 18:19:57 +0000 (-0500)
Subject: concurrent: Remove some pre-6.0 compatibility code
X-Git-Tag: v6.0.0b1~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=566441e84ef696a23005e098ba536b60e811c521;p=thirdparty%2Ftornado.git

concurrent: Remove some pre-6.0 compatibility code
---

diff --git a/tornado/concurrent.py b/tornado/concurrent.py
index e25f3454c..df12da87f 100644
--- a/tornado/concurrent.py
+++ b/tornado/concurrent.py
@@ -217,8 +217,8 @@ def future_set_exc_info(
 ) -> None:
     """Set the given ``exc_info`` as the `Future`'s exception.
 
-    Understands both `asyncio.Future` and Tornado's extensions to
-    enable better tracebacks on Python 2.
+    Understands both `asyncio.Future` and the extensions in older
+    versions of Tornado to enable better tracebacks on Python 2.
 
     .. versionadded:: 5.0
 
@@ -228,14 +228,9 @@ def future_set_exc_info(
        (previously asyncio.InvalidStateError would be raised)
 
     """
-    if hasattr(future, "set_exc_info"):
-        # Tornado's Future
-        future.set_exc_info(exc_info)  # type: ignore
-    else:
-        # asyncio.Future
-        if exc_info[1] is None:
-            raise Exception("future_set_exc_info called with no exception")
-        future_set_exception_unless_cancelled(future, exc_info[1])
+    if exc_info[1] is None:
+        raise Exception("future_set_exc_info called with no exception")
+    future_set_exception_unless_cancelled(future, exc_info[1])
 
 
 @typing.overload