(original) (raw)

changeset: 104733:6eb3312a9a16 branch: 3.6 parent: 104730:8358c68579e9 user: Guido van Rossum guido@python.org date: Tue Oct 25 18:42:51 2016 -0700 files: Lib/asynchat.py Lib/asyncore.py description: Issue #25002: Back out asyncore/asynchat deprecation. diff -r 8358c68579e9 -r 6eb3312a9a16 Lib/asynchat.py --- a/Lib/asynchat.py Tue Oct 25 23:41:42 2016 +0000 +++ b/Lib/asynchat.py Tue Oct 25 18:42:51 2016 -0700 @@ -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 -r 8358c68579e9 -r 6eb3312a9a16 Lib/asyncore.py --- a/Lib/asyncore.py Tue Oct 25 23:41:42 2016 +0000 +++ b/Lib/asyncore.py Tue Oct 25 18:42:51 2016 -0700 @@ -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: /guido@python.org