summaryrefslogtreecommitdiff
path: root/python2/futures/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'python2/futures/__init__.py')
-rw-r--r--python2/futures/__init__.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/python2/futures/__init__.py b/python2/futures/__init__.py
index 27a5720..8331d53 100644
--- a/python2/futures/__init__.py
+++ b/python2/futures/__init__.py
@@ -1,18 +1,18 @@
-# Copyright 2009 Brian Quinlan. All Rights Reserved. See LICENSE file.
+# Copyright 2009 Brian Quinlan. All Rights Reserved.
+# Licensed to PSF under a Contributor Agreement.
"""Execute computations asynchronously using threads or processes."""
__author__ = 'Brian Quinlan (brian@sweetapp.com)'
-from futures._base import (FIRST_COMPLETED, FIRST_EXCEPTION,
- ALL_COMPLETED, RETURN_IMMEDIATELY,
- CancelledError, TimeoutError,
- Future, FutureList)
+from futures._base import (FIRST_COMPLETED,
+ FIRST_EXCEPTION,
+ ALL_COMPLETED,
+ CancelledError,
+ TimeoutError,
+ Future,
+ Executor,
+ wait,
+ as_completed)
+from futures.process import ProcessPoolExecutor
from futures.thread import ThreadPoolExecutor
-
-try:
- import multiprocessing
-except ImportError:
- pass
-else:
- from futures.process import ProcessPoolExecutor