Skip to content

Commit

Permalink
concurrent: Remove some pre-6.0 compatibility code
Browse files Browse the repository at this point in the history
  • Loading branch information
bdarnell committed Dec 2, 2018
1 parent 449f2ae commit 566441e
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions tornado/concurrent.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 566441e

Please sign in to comment.