mirror of
https://github.com/python/cpython
synced 2024-09-05 00:05:39 +00:00
bpo-47061: use warnings._deprecated()
with asynchat, asyncore, and smtpd (GH-32350)
This commit is contained in:
parent
59a99ae277
commit
32b33879c2
|
@ -48,12 +48,11 @@
|
|||
import asyncore
|
||||
from collections import deque
|
||||
|
||||
from warnings import warn
|
||||
warn(
|
||||
'The asynchat module is deprecated and will be removed in Python 3.12. '
|
||||
'The recommended replacement is asyncio',
|
||||
DeprecationWarning,
|
||||
stacklevel=2)
|
||||
from warnings import _deprecated
|
||||
|
||||
_DEPRECATION_MSG = ('The {name} module is deprecated and will be removed in '
|
||||
'Python {remove}. The recommended replacement is asyncio')
|
||||
_deprecated(__name__, _DEPRECATION_MSG, remove=(3, 12))
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -57,11 +57,9 @@
|
|||
ENOTCONN, ESHUTDOWN, EISCONN, EBADF, ECONNABORTED, EPIPE, EAGAIN, \
|
||||
errorcode
|
||||
|
||||
warnings.warn(
|
||||
'The asyncore module is deprecated and will be removed in Python 3.12. '
|
||||
'The recommended replacement is asyncio',
|
||||
DeprecationWarning,
|
||||
stacklevel=2)
|
||||
_DEPRECATION_MSG = ('The {name} module is deprecated and will be removed in '
|
||||
'Python {remove}. The recommended replacement is asyncio')
|
||||
warnings._deprecated(__name__, _DEPRECATION_MSG, remove=(3, 12))
|
||||
|
||||
|
||||
_DISCONNECTED = frozenset({ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED, EPIPE,
|
||||
|
|
13
Lib/smtpd.py
13
Lib/smtpd.py
|
@ -77,19 +77,18 @@
|
|||
import time
|
||||
import socket
|
||||
import collections
|
||||
from warnings import warn
|
||||
from warnings import _deprecated, warn
|
||||
from email._header_value_parser import get_addr_spec, get_angle_addr
|
||||
|
||||
__all__ = [
|
||||
"SMTPChannel", "SMTPServer", "DebuggingServer", "PureProxy",
|
||||
]
|
||||
|
||||
warn(
|
||||
'The smtpd module is deprecated and unmaintained and will be removed '
|
||||
'in Python 3.12. Please see aiosmtpd '
|
||||
'(https://aiosmtpd.readthedocs.io/) for the recommended replacement.',
|
||||
DeprecationWarning,
|
||||
stacklevel=2)
|
||||
_DEPRECATION_MSG = ('The {name} module is deprecated and unmaintained and will '
|
||||
'be removed in Python {remove}. Please see aiosmtpd '
|
||||
'(https://aiosmtpd.readthedocs.io/) for the recommended '
|
||||
'replacement.')
|
||||
_deprecated(__name__, _DEPRECATION_MSG, remove=(3, 12))
|
||||
|
||||
|
||||
# These are imported after the above warning so that users get the correct
|
||||
|
|
Loading…
Reference in a new issue