[Python-checkins] bpo-44498: suppress DeprecationWarnings for asynchat, asyncore and smtpd in tests (GH-26905)
iritkatriel
webhook-mailer at python.org
Thu Jun 24 19:20:49 EDT 2021
https://github.com/python/cpython/commit/22e7effad571f8e524d2f71ff55bbf2a25306753
commit: 22e7effad571f8e524d2f71ff55bbf2a25306753
branch: main
author: Irit Katriel <1055913+iritkatriel at users.noreply.github.com>
committer: iritkatriel <1055913+iritkatriel at users.noreply.github.com>
date: 2021-06-25T00:20:40+01:00
summary:
bpo-44498: suppress DeprecationWarnings for asynchat, asyncore and smtpd in tests (GH-26905)
files:
M Lib/test/test_asynchat.py
M Lib/test/test_asyncore.py
M Lib/test/test_ftplib.py
M Lib/test/test_logging.py
M Lib/test/test_os.py
M Lib/test/test_poplib.py
M Lib/test/test_smtpd.py
M Lib/test/test_smtplib.py
M Lib/test/test_ssl.py
diff --git a/Lib/test/test_asynchat.py b/Lib/test/test_asynchat.py
index b32edddc7d550..973ac1f7d97c9 100644
--- a/Lib/test/test_asynchat.py
+++ b/Lib/test/test_asynchat.py
@@ -4,8 +4,6 @@
from test.support import socket_helper
from test.support import threading_helper
-import asynchat
-import asyncore
import errno
import socket
import sys
@@ -14,6 +12,12 @@
import unittest
import unittest.mock
+import warnings
+with warnings.catch_warnings():
+ warnings.simplefilter('ignore', DeprecationWarning)
+ import asynchat
+ import asyncore
+
HOST = socket_helper.HOST
SERVER_QUIT = b'QUIT\n'
diff --git a/Lib/test/test_asyncore.py b/Lib/test/test_asyncore.py
index 3bd904d1774bc..ecd1e120ecb51 100644
--- a/Lib/test/test_asyncore.py
+++ b/Lib/test/test_asyncore.py
@@ -1,4 +1,3 @@
-import asyncore
import unittest
import select
import os
@@ -19,6 +18,11 @@
if support.PGO:
raise unittest.SkipTest("test is not helpful for PGO")
+import warnings
+with warnings.catch_warnings():
+ warnings.simplefilter('ignore', DeprecationWarning)
+ import asyncore
+
HAS_UNIX_SOCKETS = hasattr(socket, 'AF_UNIX')
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
index a48b429ca3802..3492ba44f2103 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -4,8 +4,6 @@
# environment
import ftplib
-import asyncore
-import asynchat
import socket
import io
import errno
@@ -24,6 +22,13 @@
from test.support import warnings_helper
from test.support.socket_helper import HOST, HOSTv6
+import warnings
+with warnings.catch_warnings():
+ warnings.simplefilter('ignore', DeprecationWarning)
+ import asyncore
+ import asynchat
+
+
TIMEOUT = support.LOOPBACK_TIMEOUT
DEFAULT_ENCODING = 'utf-8'
# the dummy data returned by server over the data channel when
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 6d111908e7c39..48ed2eb2fc63b 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -54,13 +54,16 @@
import warnings
import weakref
-import asyncore
from http.server import HTTPServer, BaseHTTPRequestHandler
-import smtpd
from urllib.parse import urlparse, parse_qs
from socketserver import (ThreadingUDPServer, DatagramRequestHandler,
ThreadingTCPServer, StreamRequestHandler)
+with warnings.catch_warnings():
+ warnings.simplefilter('ignore', DeprecationWarning)
+ import asyncore
+ import smtpd
+
try:
import win32evtlog, win32evtlogutil, pywintypes
except ImportError:
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 8b3d1feb78fe3..684e308ad3a05 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -2,8 +2,6 @@
# does add tests for a few functions which have been determined to be more
# portable than they had been thought to be.
-import asynchat
-import asyncore
import codecs
import contextlib
import decimal
@@ -39,6 +37,11 @@
from test.support import warnings_helper
from platform import win32_is_iot
+with warnings.catch_warnings():
+ warnings.simplefilter('ignore', DeprecationWarning)
+ import asynchat
+ import asyncore
+
try:
import resource
except ImportError:
diff --git a/Lib/test/test_poplib.py b/Lib/test/test_poplib.py
index c5ae9f77e4f00..8dd6ea69c0d1a 100644
--- a/Lib/test/test_poplib.py
+++ b/Lib/test/test_poplib.py
@@ -4,8 +4,6 @@
# a real test suite
import poplib
-import asyncore
-import asynchat
import socket
import os
import errno
@@ -17,6 +15,12 @@
from test.support import socket_helper
from test.support import threading_helper
+import warnings
+with warnings.catch_warnings():
+ warnings.simplefilter('ignore', DeprecationWarning)
+ import asynchat
+ import asyncore
+
HOST = socket_helper.HOST
PORT = 0
diff --git a/Lib/test/test_smtpd.py b/Lib/test/test_smtpd.py
index 6303192d1b26c..d2e150d535ff6 100644
--- a/Lib/test/test_smtpd.py
+++ b/Lib/test/test_smtpd.py
@@ -5,8 +5,12 @@
from test.support import warnings_helper
import socket
import io
-import smtpd
-import asyncore
+
+import warnings
+with warnings.catch_warnings():
+ warnings.simplefilter('ignore', DeprecationWarning)
+ import smtpd
+ import asyncore
class DummyServer(smtpd.SMTPServer):
diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py
index f3d33ab0772dd..483d747ee6a49 100644
--- a/Lib/test/test_smtplib.py
+++ b/Lib/test/test_smtplib.py
@@ -1,4 +1,3 @@
-import asyncore
import base64
import email.mime.text
from email.message import EmailMessage
@@ -7,7 +6,6 @@
import hashlib
import hmac
import socket
-import smtpd
import smtplib
import io
import re
@@ -25,6 +23,12 @@
from test.support import threading_helper
from unittest.mock import Mock
+import warnings
+with warnings.catch_warnings():
+ warnings.simplefilter('ignore', DeprecationWarning)
+ import asyncore
+ import smtpd
+
HOST = socket_helper.HOST
if sys.platform == 'darwin':
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 11f4c3c2e8e5b..0cd3fb47a969a 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -21,7 +21,6 @@
import urllib.request
import threading
import traceback
-import asyncore
import weakref
import platform
import sysconfig
@@ -31,6 +30,11 @@
except ImportError:
ctypes = None
+import warnings
+with warnings.catch_warnings():
+ warnings.simplefilter('ignore', DeprecationWarning)
+ import asyncore
+
ssl = import_helper.import_module("ssl")
import _ssl
More information about the Python-checkins
mailing list