summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2019-12-24 10:46:42 (GMT)
committerGitHub <noreply@github.com>2019-12-24 10:46:42 (GMT)
commit025eeaa19607b2a80c979668dad405f567444573 (patch)
treee9caca1be9eb089e601cd2f64f5a38f85dd112fd
parent3c75f31bb2b88b3e3d858448e789b2c0d2e3e082 (diff)
downloadcpython-025eeaa19607b2a80c979668dad405f567444573.zip
cpython-025eeaa19607b2a80c979668dad405f567444573.tar.gz
cpython-025eeaa19607b2a80c979668dad405f567444573.tar.bz2
Fix import path for asyncio.TimeoutError (#17691)
-rw-r--r--Lib/asyncio/staggered.py4
-rw-r--r--Misc/NEWS.d/next/Library/2019-12-24-10-43-13.bpo-39129.jVx5rW.rst1
2 files changed, 3 insertions, 2 deletions
diff --git a/Lib/asyncio/staggered.py b/Lib/asyncio/staggered.py
index 27c665a..451a53a 100644
--- a/Lib/asyncio/staggered.py
+++ b/Lib/asyncio/staggered.py
@@ -6,7 +6,7 @@ import contextlib
import typing
from . import events
-from . import futures
+from . import exceptions as exceptions_mod
from . import locks
from . import tasks
@@ -83,7 +83,7 @@ async def staggered_race(
previous_failed: typing.Optional[locks.Event]) -> None:
# Wait for the previous task to finish, or for delay seconds
if previous_failed is not None:
- with contextlib.suppress(futures.TimeoutError):
+ with contextlib.suppress(exceptions_mod.TimeoutError):
# Use asyncio.wait_for() instead of asyncio.wait() here, so
# that if we get cancelled at this point, Event.wait() is also
# cancelled, otherwise there will be a "Task destroyed but it is
diff --git a/Misc/NEWS.d/next/Library/2019-12-24-10-43-13.bpo-39129.jVx5rW.rst b/Misc/NEWS.d/next/Library/2019-12-24-10-43-13.bpo-39129.jVx5rW.rst
new file mode 100644
index 0000000..6667697
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2019-12-24-10-43-13.bpo-39129.jVx5rW.rst
@@ -0,0 +1 @@
+Fix import path for ``asyncio.TimeoutError``