diff options
| author | Brett Cannon <brett@python.org> | 2012-06-15 23:04:29 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2012-06-15 23:04:29 (GMT) |
| commit | 24aa693c7ef8f217fbd238eb7af7d828e13a07eb (patch) | |
| tree | 7d01ab630c2e8eef1e168b1aa5d84131b60cfd50 /Lib/multiprocessing/dummy | |
| parent | 99d776fdf4aa5a66266ebcec2263fab501f03088 (diff) | |
| parent | 016ef551a793f72f582d707ce5bb55bf4940cf27 (diff) | |
| download | cpython-24aa693c7ef8f217fbd238eb7af7d828e13a07eb.zip cpython-24aa693c7ef8f217fbd238eb7af7d828e13a07eb.tar.gz cpython-24aa693c7ef8f217fbd238eb7af7d828e13a07eb.tar.bz2 | |
Merge
Diffstat (limited to 'Lib/multiprocessing/dummy')
| -rw-r--r-- | Lib/multiprocessing/dummy/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/multiprocessing/dummy/__init__.py b/Lib/multiprocessing/dummy/__init__.py index 9bf8f6b..e31fc61 100644 --- a/Lib/multiprocessing/dummy/__init__.py +++ b/Lib/multiprocessing/dummy/__init__.py @@ -35,7 +35,7 @@ __all__ = [ 'Process', 'current_process', 'active_children', 'freeze_support', 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Condition', - 'Event', 'Queue', 'Manager', 'Pipe', 'Pool', 'JoinableQueue' + 'Event', 'Barrier', 'Queue', 'Manager', 'Pipe', 'Pool', 'JoinableQueue' ] # @@ -49,7 +49,7 @@ import array from multiprocessing.dummy.connection import Pipe from threading import Lock, RLock, Semaphore, BoundedSemaphore -from threading import Event, Condition +from threading import Event, Condition, Barrier from queue import Queue # |