From e81a773352bdfae94856f69b54f0e37917bd688b Mon Sep 17 00:00:00 2001 From: R David Murray Date: Sun, 12 Apr 2015 18:47:56 -0400 Subject: [PATCH] #23464: remove JoinableQueue that was deprecated in 3.4.4. Patch by A. Jesse Jiryu Davis. --- Doc/library/asyncio-queue.rst | 11 ----------- Doc/whatsnew/3.5.rst | 4 ++++ Lib/asyncio/queues.py | 7 +------ Misc/NEWS | 2 ++ 4 files changed, 7 insertions(+), 17 deletions(-) diff --git a/Doc/library/asyncio-queue.rst b/Doc/library/asyncio-queue.rst index 33706726a3..f11c09ac29 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 e3381aeb76..28914ef76d 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 84cdabcf54..264e1ce8b3 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 f6ae315888..b9864ccbdb 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 -- 2.50.1