test: update test.support and test_io to 3.10

Initially this is only meant to be a small update for `test_io.py`.
But it turns out that `test.support` need a lot of cleanup especially
for `test.support.warnings_helper`.

Author: deantvv

Lib/test/support/__init__.py

@@ -13,6 +13,7 @@
 from test.support import os_helper
 from test.support import socket_helper
 from test.support import threading_helper
+from test.support import warnings_helper
 from io import BytesIO
 
 if support.PGO:
@@ -421,7 +422,7 @@ def test_resource_warning(self):
         f = asyncore.file_wrapper(fd)
 
         os.close(fd)
-        with support.check_warnings(('', ResourceWarning)):
+        with warnings_helper.check_warnings(('', ResourceWarning)):
             f = None
             support.gc_collect()
 

Lib/test/test_asyncore.py

@@ -20,7 +20,8 @@
 from functools import partial
 from contextlib import ExitStack
 from operator import neg
-from test.support import check_warnings, swap_attr
+from test.support import swap_attr
+from test.support.warnings_helper import check_warnings
 from test.support.script_helper import assert_python_ok
 from test.support.os_helper import EnvironmentVarGuard, TESTFN, unlink
 from unittest.mock import MagicMock, patch

Lib/test/test_builtin.py

@@ -18,15 +18,15 @@
 import test.support
 import test.string_tests
 import test.list_tests
-from test.support import bigaddrspacetest, MAX_Py_ssize_t, import_helper
+from test.support import bigaddrspacetest, MAX_Py_ssize_t, import_helper, warnings_helper
 from test.support.script_helper import assert_python_failure
 
 
 if sys.flags.bytes_warning:
     def check_bytes_warnings(func):
         @functools.wraps(func)
         def wrapper(*args, **kw):
-            with test.support.check_warnings(('', BytesWarning)):
+            with warnings_helper.check_warnings(('', BytesWarning)):
                 return func(*args, **kw)
         return wrapper
 else:
@@ -1805,7 +1805,7 @@ def test_return_self(self):
                          "BytesWarning is needed for this test: use -bb option")
     def test_compare(self):
         def bytes_warning():
-            return test.support.check_warnings(('', BytesWarning))
+            return test.warnings_helper.check_warningswarnings(('', BytesWarning))
         with bytes_warning():
             b'' == ''
         with bytes_warning():

Lib/test/test_bytes.py

@@ -6,6 +6,7 @@
 import unittest
 import warnings
 from test import support
+from test.support import warnings_helper
 
 from codeop import compile_command, PyCF_DONT_IMPLY_DEDENT
 import io
@@ -313,8 +314,8 @@ def test_filename(self):
     # TODO: RUSTPYTHON
     @unittest.expectedFailure
     def test_warning(self):
-        # Test that the warning is only returned once.
-        with support.check_warnings(
+        # Teswarnings_helper.check_warningsonly returned once.
+        with warnings_helper.check_warnings(
                 (".*literal", SyntaxWarning),
                 (".*invalid", DeprecationWarning),
         ) as w:

Lib/test/test_codeop.py

@@ -12,9 +12,10 @@
                           cpython_only, gc_collect,
                           no_tracing, script_helper,
                           SuppressCrashReport,
-                          check_warnings,)
+                          )
 from test.support.os_helper import TESTFN, unlink
 from test.support.import_helper import import_module
+from test.support.warnings_helper import check_warnings
 from test import support
 
 class NaiveException(Exception):

Lib/test/test_exceptions.py

@@ -7,8 +7,7 @@
 import io
 import _pyio as pyio
 
-from test import support
-from test.support import os_helper
+from test.support import os_helper, warnings_helper
 from test.support.os_helper import TESTFN
 from collections import UserList
 
@@ -189,7 +188,7 @@ def testSetBufferSize(self):
         # make sure that explicitly setting the buffer size doesn't cause
         # misbehaviour especially with repeated close() calls
         for s in (-1, 0, 512):
-            with support.check_no_warnings(self,
+            with warnings_helper.check_no_warnings(self,
                                            message='line buffering',
                                            category=RuntimeWarning):
                 self._checkBufferSize(s)

Lib/test/test_file.py

@@ -9,9 +9,9 @@
 from weakref import proxy
 from functools import wraps
 
-from test.support import (check_warnings, run_unittest,
-                          cpython_only, swap_attr)
+from test.support import run_unittest, cpython_only, swap_attr
 from test.support.os_helper import TESTFN, TESTFN_UNICODE, make_bad_fd
+from test.support.warnings_helper import check_warnings
 from collections import UserList
 
 import _io  # C implementation of io

Lib/test/test_fileio.py

@@ -22,6 +22,7 @@
 from test import support
 from test.support import threading_helper
 from test.support import socket_helper
+from test.support import warnings_helper
 from test.support.socket_helper import HOST, HOSTv6
 
 import sys
@@ -622,8 +623,8 @@ def test_storlines(self):
         self.assertTrue(flag)
 
         f = io.StringIO(RETR_DATA.replace('\r\n', '\n'))
-        # storlines() expects a binary file, not a text file
-        with support.check_warnings(('', BytesWarning), quiet=True):
+        # stowarnings_helper.check_warningsary file, not a text file
+        with warnings_helper.check_warnings(('', BytesWarning), quiet=True):
             self.assertRaises(TypeError, self.client.storlines, 'stor foo', f)
 
     def test_nlst(self):

Lib/test/test_ftplib.py

@@ -525,7 +525,7 @@ def test_nonascii_abspath(self):
 
     def test_join_errors(self):
         # Check join() raises friendly TypeErrors.
-        from .support import check_warnings
+        from .support.warnings_helper import check_warnings
         with check_warnings(('', BytesWarning), quiet=True):
             errmsg = "Can't mix strings and bytes in path components"
             with self.assertRaisesRegex(TypeError, errmsg):
@@ -546,7 +546,7 @@ def test_join_errors(self):
 
     def test_relpath_errors(self):
         # Check relpath() raises friendly TypeErrors.
-        from .support import check_warnings
+        from .support.warnings_helper import check_warnings
         with check_warnings(('', (BytesWarning, DeprecationWarning)),
                                     quiet=True):
             errmsg = "Can't mix strings and bytes in path components"