summaryrefslogtreecommitdiffstats
path: root/Lib/asyncio/queues.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-07-25 00:45:18 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-07-25 00:45:18 (GMT)
commit9625340cc8ca426d0f339d460022955bc01155fd (patch)
tree02bb10987b53cbaedad246122b5470e35b26e40e /Lib/asyncio/queues.py
parent401e52e80374783cc5d04ccee8071b540340c46b (diff)
parent389e3d768d8f5bd312476db795f6432651bc656b (diff)
downloadcpython-9625340cc8ca426d0f339d460022955bc01155fd.zip
cpython-9625340cc8ca426d0f339d460022955bc01155fd.tar.gz
cpython-9625340cc8ca426d0f339d460022955bc01155fd.tar.bz2
Merge 3.5 (asyncio)
Diffstat (limited to 'Lib/asyncio/queues.py')
-rw-r--r--Lib/asyncio/queues.py7
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')