Issue #234: Drop JoinableQueue on Python 3.5+

2 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 25155a9..421704c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tulip 3.4.4
+===========
+
+* Issue #234: Drop asyncio.JoinableQueue on Python 3.5 and newer
+
+
 2015-02-04: Tulip 3.4.3
 =======================
 
diff --git a/asyncio/queues.py b/asyncio/queues.py
index 3b4dc21..c55dd8b 100644
--- a/asyncio/queues.py
+++ b/asyncio/queues.py
@@ -1,11 +1,11 @@
 """Queues"""
 
-__all__ = ['Queue', 'PriorityQueue', 'LifoQueue', 'QueueFull', 'QueueEmpty',
-           'JoinableQueue']
+__all__ = ['Queue', 'PriorityQueue', 'LifoQueue', 'QueueFull', 'QueueEmpty']
 
 import collections
 import heapq
 
+from . import compat
 from . import events
 from . import futures
 from . import locks
@@ -289,5 +289,7 @@ class LifoQueue(Queue):
         return self._queue.pop()
 
 
-JoinableQueue = Queue
-"""Deprecated alias for Queue."""
+if not compat.PY35:
+    JoinableQueue = Queue
+    """Deprecated alias for Queue."""
+    __all__.append('JoinableQueue')