summaryrefslogtreecommitdiffstats
path: root/Lib/concurrent
diff options
context:
space:
mode:
authorBrian Quinlan <brian@sweetapp.com>2019-05-07 17:31:11 (GMT)
committerGregory P. Smith <greg@krypto.org>2019-05-07 17:31:11 (GMT)
commitf7bda5c5729a3cc69b32c2a3baf5c64dea666d33 (patch)
treed9bd7d26071690edbaadd92d421f301431467d8e /Lib/concurrent
parent63deaa5b70108ef441c57728322da6b4321db4fc (diff)
downloadcpython-f7bda5c5729a3cc69b32c2a3baf5c64dea666d33.zip
cpython-f7bda5c5729a3cc69b32c2a3baf5c64dea666d33.tar.gz
cpython-f7bda5c5729a3cc69b32c2a3baf5c64dea666d33.tar.bz2
Don't import wait from connection, it shadows a name (GH-13112)
(lint cleanup) This import causes an argument parameter to shadow the global import name.
Diffstat (limited to 'Lib/concurrent')
-rw-r--r--Lib/concurrent/futures/process.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py
index 21bf4a4..d7e2478 100644
--- a/Lib/concurrent/futures/process.py
+++ b/Lib/concurrent/futures/process.py
@@ -51,7 +51,7 @@ from concurrent.futures import _base
import queue
from queue import Full
import multiprocessing as mp
-from multiprocessing.connection import wait
+import multiprocessing.connection
from multiprocessing.queues import Queue
import threading
import weakref
@@ -352,7 +352,7 @@ def _queue_management_worker(executor_reference,
# submitted, from the executor being shutdown/gc-ed, or from the
# shutdown of the python interpreter.
worker_sentinels = [p.sentinel for p in processes.values()]
- ready = wait(readers + worker_sentinels)
+ ready = mp.connection.wait(readers + worker_sentinels)
cause = None
is_broken = True