#23464: remove JoinableQueue that was deprecated in 3.4.4.

Patch by A. Jesse Jiryu Davis.

diff --git a/Doc/library/asyncio-queue.rst b/Doc/library/asyncio-queue.rst
index 33706726a3db73f4ecf17bc3f5003dd54d94be17..f11c09ac29055e9ffa610beb9bdfb0d4ee2ac658 100644 (file)
--- a/Doc/library/asyncio-queue.rst
+++ b/Doc/library/asyncio-queue.rst
@@ -8,7 +8,6 @@ Queues:
 * :class:`Queue`
 * :class:`PriorityQueue`
 * :class:`LifoQueue`
-* :class:`JoinableQueue`
 
 asyncio queue API was designed to be close to classes of the :mod:`queue`
 module (:class:`~queue.Queue`, :class:`~queue.PriorityQueue`,
@@ -144,16 +143,6 @@ LifoQueue
     first.
 
 
-JoinableQueue
-^^^^^^^^^^^^^
-
-.. class:: JoinableQueue
-
-   Deprecated alias for :class:`Queue`.
-
-   .. deprecated:: 3.4.4
-
-
 Exceptions
 ^^^^^^^^^^
 

diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
index e3381aeb76c9580e310be1f99bf9c76072770061..28914ef76d6976c17262f5bdb93b03a8e5a56c67 100644 (file)
--- a/Doc/whatsnew/3.5.rst
+++ b/Doc/whatsnew/3.5.rst
@@ -630,6 +630,10 @@ removed:
   3.4, and has now been removed.
   (Contributed by Matt Chaput in :issue:`6623`.)
 
+* The JoinableQueue class in the provisional asyncio module was deprecated
+  in 3.4.4 and is now removed (:issue:`23464`).
+
+
 Porting to Python 3.5
 =====================
 

diff --git a/Lib/asyncio/queues.py b/Lib/asyncio/queues.py
index 84cdabcf54fb007fc8bd877eeb1f904bfc746f2a..264e1ce8b367d9f96d412d66d6ea592efe6147d1 100644 (file)
--- a/Lib/asyncio/queues.py
+++ b/Lib/asyncio/queues.py
@@ -1,7 +1,6 @@
 """Queues"""
 
-__all__ = ['Queue', 'PriorityQueue', 'LifoQueue', 'QueueFull', 'QueueEmpty',
-           'JoinableQueue']
+__all__ = ['Queue', 'PriorityQueue', 'LifoQueue', 'QueueFull', 'QueueEmpty']
 
 import collections
 import heapq
@@ -280,7 +279,3 @@ class LifoQueue(Queue):
 
     def _get(self):
         return self._queue.pop()
-
-
-JoinableQueue = Queue
-"""Deprecated alias for Queue."""

diff --git a/Misc/NEWS b/Misc/NEWS
index f6ae315888ff72e7e3620bfee63d38485c80e347..b9864ccbdb5c6b7bd0eb2a501846acc77cb2db5a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -19,6 +19,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #23464: Removed deprecated asyncio JoinableQueue.
+
 - Issue #23529: Limit the size of decompressed data when reading from
   GzipFile, BZ2File or LZMAFile.  This defeats denial of service attacks
   using compressed bombs (i.e. compressed payloads which decompress to a huge