diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-07-25 00:43:31 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-07-25 00:43:31 (GMT) |
| commit | 389e3d768d8f5bd312476db795f6432651bc656b (patch) | |
| tree | e97e07d562b934dd0b4159ddb3d26203e0f7908a /Lib/asyncio/queues.py | |
| parent | 71f70b8f1a87ee3fc2750776eb24d8c906884f84 (diff) | |
| parent | eaf16abc68a09e2d976c37e34eb606f5b519f7ea (diff) | |
| download | cpython-389e3d768d8f5bd312476db795f6432651bc656b.zip cpython-389e3d768d8f5bd312476db795f6432651bc656b.tar.gz cpython-389e3d768d8f5bd312476db795f6432651bc656b.tar.bz2 | |
Merge 3.4
Diffstat (limited to 'Lib/asyncio/queues.py')
| -rw-r--r-- | Lib/asyncio/queues.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py index e9ba0cd..c55dd8b 100644 --- a/Lib/asyncio/queues.py +++ b/Lib/asyncio/queues.py @@ -5,6 +5,7 @@ __all__ = ['Queue', 'PriorityQueue', 'LifoQueue', 'QueueFull', 'QueueEmpty'] import collections import heapq +from . import compat from . import events from . import futures from . import locks @@ -286,3 +287,9 @@ class LifoQueue(Queue): def _get(self): return self._queue.pop() + + +if not compat.PY35: + JoinableQueue = Queue + """Deprecated alias for Queue.""" + __all__.append('JoinableQueue') |