--- a/mercurial/thirdparty/concurrent/futures/__init__.py Mon Apr 09 12:22:31 2018 -0700
+++ b/mercurial/thirdparty/concurrent/futures/__init__.py Mon Apr 09 12:23:48 2018 -0700
@@ -3,21 +3,25 @@
"""Execute computations asynchronously using threads or processes."""
+from __future__ import absolute_import
+
__author__ = 'Brian Quinlan (brian@sweetapp.com)'
-from concurrent.futures._base import (FIRST_COMPLETED,
- FIRST_EXCEPTION,
- ALL_COMPLETED,
- CancelledError,
- TimeoutError,
- Future,
- Executor,
- wait,
- as_completed)
-from concurrent.futures.thread import ThreadPoolExecutor
+from ._base import (
+ FIRST_COMPLETED,
+ FIRST_EXCEPTION,
+ ALL_COMPLETED,
+ CancelledError,
+ TimeoutError,
+ Future,
+ Executor,
+ wait,
+ as_completed,
+)
+from .thread import ThreadPoolExecutor
try:
- from concurrent.futures.process import ProcessPoolExecutor
+ from .process import ProcessPoolExecutor
except ImportError:
# some platforms don't have multiprocessing
pass