[Python-checkins] cpython (merge 3.6 -> default): Issue #25002: Back out asyncore/asynchat deprecation. (3.6->3.7)

[guido.van.rossum]

https://hg.python.org/cpython/rev/2879185bc511
changeset:   104734:2879185bc511
parent:      104731:0dd8b3f133f9
parent:      104733:6eb3312a9a16
user:        Guido van Rossum <guido at python.org>
date:        Tue Oct 25 18:43:21 2016 -0700
summary:
  Issue #25002: Back out asyncore/asynchat deprecation. (3.6->3.7)

files:
  Lib/asynchat.py |  5 -----
  Lib/asyncore.py |  4 ----
  2 files changed, 0 insertions(+), 9 deletions(-)


diff --git a/Lib/asynchat.py b/Lib/asynchat.py
--- a/Lib/asynchat.py
+++ b/Lib/asynchat.py
@@ -46,13 +46,8 @@
 you - by calling your self.found_terminator() method.
 """
 import asyncore
-import warnings
-
 from collections import deque
 
-warnings.warn(
-    'asynchat module is deprecated in 3.6. Use asyncio instead.',
-    PendingDeprecationWarning, stacklevel=2)
 
 class async_chat(asyncore.dispatcher):
     """This is an abstract class.  You must derive from this class, and add
diff --git a/Lib/asyncore.py b/Lib/asyncore.py
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -60,10 +60,6 @@
 _DISCONNECTED = frozenset({ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED, EPIPE,
                            EBADF})
 
-warnings.warn(
-    'asyncore module is deprecated in 3.6. Use asyncio instead.',
-    PendingDeprecationWarning, stacklevel=2)
-
 try:
     socket_map
 except NameError:

-- 
Repository URL: https://hg.python.org/cpython