summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2015-04-12 22:47:56 (GMT)
committerR David Murray <rdmurray@bitdance.com>2015-04-12 22:47:56 (GMT)
commite81a773352bdfae94856f69b54f0e37917bd688b (patch)
tree330e9a547578074b27e22c6f03825af69e3e6b84
parent5646de47e18b8a357dff4e01c2f949c6f288e035 (diff)
downloadcpython-e81a773352bdfae94856f69b54f0e37917bd688b.zip
cpython-e81a773352bdfae94856f69b54f0e37917bd688b.tar.gz
cpython-e81a773352bdfae94856f69b54f0e37917bd688b.tar.bz2
#23464: remove JoinableQueue that was deprecated in 3.4.4.
Patch by A. Jesse Jiryu Davis.
-rw-r--r--Doc/library/asyncio-queue.rst11
-rw-r--r--Doc/whatsnew/3.5.rst4
-rw-r--r--Lib/asyncio/queues.py7
-rw-r--r--Misc/NEWS2
4 files changed, 7 insertions, 17 deletions
diff --git a/Doc/library/asyncio-queue.rst b/Doc/library/asyncio-queue.rst
index 3370672..f11c09a 100644
--- 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 e3381ae..28914ef 100644
--- 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 84cdabc..264e1ce 100644
--- 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 f6ae315..b9864cc 100644
--- 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