From e199c2e4bc95c4df25f0270cedbee934083f4ae8 Mon Sep 17 00:00:00 2001 From: Ivan Levkivskyi Date: Wed, 27 May 2020 13:51:01 +0100 Subject: [PATCH] Fix concurrent.futures import for re-export (#4105) Also update stubtest whitelist as a workaround. --- stdlib/3/concurrent/futures/__init__.pyi | 4 ++-- tests/stubtest_whitelists/py3_common.txt | 1 + third_party/2/concurrent/futures/__init__.pyi | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/stdlib/3/concurrent/futures/__init__.pyi b/stdlib/3/concurrent/futures/__init__.pyi index 66bc60f81..9dfe12bac 100644 --- a/stdlib/3/concurrent/futures/__init__.pyi +++ b/stdlib/3/concurrent/futures/__init__.pyi @@ -14,5 +14,5 @@ if sys.version_info >= (3, 8): from ._base import InvalidStateError as InvalidStateError if sys.version_info >= (3, 7): from ._base import BrokenExecutor as BrokenExecutor -from .thread import ThreadPoolExecutor -from .process import ProcessPoolExecutor +from .thread import ThreadPoolExecutor as ThreadPoolExecutor +from .process import ProcessPoolExecutor as ProcessPoolExecutor diff --git a/tests/stubtest_whitelists/py3_common.txt b/tests/stubtest_whitelists/py3_common.txt index 5260264f9..ea18554cb 100644 --- a/tests/stubtest_whitelists/py3_common.txt +++ b/tests/stubtest_whitelists/py3_common.txt @@ -133,6 +133,7 @@ collections.abc.Set.isdisjoint collections.deque.__hash__ concurrent.futures.Executor.map concurrent.futures._base.Executor.map +concurrent.futures.ProcessPoolExecutor.map concurrent.futures.process.ProcessPoolExecutor.map configparser.DuplicateOptionError.__init__ configparser.DuplicateSectionError.__init__ diff --git a/third_party/2/concurrent/futures/__init__.pyi b/third_party/2/concurrent/futures/__init__.pyi index 66bc60f81..9dfe12bac 100644 --- a/third_party/2/concurrent/futures/__init__.pyi +++ b/third_party/2/concurrent/futures/__init__.pyi @@ -14,5 +14,5 @@ if sys.version_info >= (3, 8): from ._base import InvalidStateError as InvalidStateError if sys.version_info >= (3, 7): from ._base import BrokenExecutor as BrokenExecutor -from .thread import ThreadPoolExecutor -from .process import ProcessPoolExecutor +from .thread import ThreadPoolExecutor as ThreadPoolExecutor +from .process import ProcessPoolExecutor as ProcessPoolExecutor