[3.10] bpo-46198: rename duplicate tests and remove unused code (GH-30297) (GH-31796)

(cherry picked from commit 6c83c8e6b56b57a8a794e7b6c07837be4ce3bb97)

Co-authored-by: Nikita Sobolev <mail@sobolevn.me>

diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index 9f551d9b9748d395dc006958370241e5f6378020..58336595c1f57480cf4665d3bf7b0b09b41727bd 100644 (file)
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -1861,8 +1861,6 @@ class TestDate(HarmlessMixedComparison, unittest.TestCase):
 
     def test_fromisoformat_fails_typeerror(self):
         # Test that fromisoformat fails when passed the wrong type
-        import io
-
         bad_types = [b'2009-03-01', None, io.StringIO('2009-03-01')]
         for bad_type in bad_types:
             with self.assertRaises(TypeError):
@@ -3985,8 +3983,6 @@ class TestTimeTZ(TestTime, TZInfoBase, unittest.TestCase):
 
     def test_fromisoformat_fails_typeerror(self):
         # Test the fromisoformat fails when passed the wrong type
-        import io
-
         bad_types = [b'12:30:45', None, io.StringIO('12:30:45')]
 
         for bad_type in bad_types:

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index ed6f1979732d3bcbb4c2ac0e03518ecf0392bb88..63435780c9a58194f4d9f148a6eecf4976dcd0da 100644 (file)
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -1381,9 +1381,6 @@ class PythonSymlink:
 
         self._platform_specific()
 
-    def _platform_specific(self):
-        pass
-
     if sys.platform == "win32":
         def _platform_specific(self):
             import glob
@@ -1411,6 +1408,9 @@ class PythonSymlink:
             self._env["PYTHONHOME"] = os.path.dirname(self.real)
             if sysconfig.is_python_build(True):
                 self._env["PYTHONPATH"] = os.path.dirname(os.__file__)
+    else:
+        def _platform_specific(self):
+            pass
 
     def __enter__(self):
         os.symlink(self.real, self.link)

diff --git a/Lib/test/test_asyncio/test_sslproto.py b/Lib/test/test_asyncio/test_sslproto.py
index 22a216a83e3f92395beb8cd9e85bd80cb07f657c..f7411a8142cc87a9cd4b029cbb891cc4cd26f9cf 100644 (file)
--- a/Lib/test/test_asyncio/test_sslproto.py
+++ b/Lib/test/test_asyncio/test_sslproto.py
@@ -2,7 +2,6 @@
 
 import logging
 import socket
-from test import support
 import unittest
 import weakref
 from unittest import mock

diff --git a/Lib/test/test_codecs.py b/Lib/test/test_codecs.py
index f7310fbb1474ae83999ab53c3f7d66fcd8c2abb3..a9c43d9554beafa65ea3979fdfd24c4337141e63 100644 (file)
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -32,7 +32,7 @@ def coding_checker(self, coder):
 # On small versions of Windows like Windows IoT or Windows Nano Server not all codepages are present
 def is_code_page_present(cp):
     from ctypes import POINTER, WINFUNCTYPE, WinDLL
-    from ctypes.wintypes import BOOL, UINT, BYTE, WCHAR, UINT, DWORD
+    from ctypes.wintypes import BOOL, BYTE, WCHAR, UINT, DWORD
 
     MAX_LEADBYTES = 12  # 5 ranges, 2 bytes ea., 0 term.
     MAX_DEFAULTCHAR = 2 # single or double byte

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 5f80a583450eaa5f9ea6b1289a1739a78a53c1dc..9859d9a46710d31e7bc8c3c2949124e04239716b 100644 (file)
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -1023,7 +1023,7 @@ class TestExpressionStackSize(unittest.TestCase):
         kwargs = (f'a{i}=x' for i in range(self.N))
         self.check_stack_size("f(" +  ", ".join(kwargs) + ")")
 
-    def test_func_args(self):
+    def test_meth_args(self):
         self.check_stack_size("o.m(" + "x, " * self.N + ")")
 
     def test_meth_kwargs(self):

diff --git a/Lib/test/test_dict.py b/Lib/test/test_dict.py
index 54d100288cb627434c348f93ac23d3daf56f60af..8aad4a5967b34e88f7ac6827ae1eb4805cdd08d1 100644 (file)
--- a/Lib/test/test_dict.py
+++ b/Lib/test/test_dict.py
@@ -1465,7 +1465,7 @@ class DictTest(unittest.TestCase):
         self.assertTrue(gc.is_tracked(next(it)))
 
     @support.cpython_only
-    def test_dict_items_result_gc(self):
+    def test_dict_items_result_gc_reversed(self):
         # Same as test_dict_items_result_gc above, but reversed.
         it = reversed({None: []}.items())
         gc.collect()

diff --git a/Lib/test/test_email/test__header_value_parser.py b/Lib/test/test_email/test__header_value_parser.py
index 1bdcfa129b4c8717d05bee9118db5e6ea792a005..854f2ff009c61851f58af5213f21e678974c024c 100644 (file)
--- a/Lib/test/test_email/test__header_value_parser.py
+++ b/Lib/test/test_email/test__header_value_parser.py
@@ -395,7 +395,7 @@ class TestParser(TestParserMixin, TestEmailBase):
             [errors.InvalidHeaderDefect],
             '')
 
-    def test_get_unstructured_invalid_ew(self):
+    def test_get_unstructured_invalid_ew2(self):
         self._test_get_x(self._get_unst,
             '=?utf-8?q?=somevalue?=',
             '=?utf-8?q?=somevalue?=',

diff --git a/Lib/test/test_pty.py b/Lib/test/test_pty.py
index 0c178127571b07c8310de09c52306b2ea8da5466..0243b8a30b9367cec74972dfa0c4bc805c27c7ed 100644 (file)
--- a/Lib/test/test_pty.py
+++ b/Lib/test/test_pty.py
@@ -16,7 +16,6 @@ import io # readline
 import unittest
 
 import struct
-import tty
 import fcntl
 import warnings
 

diff --git a/Lib/test/test_tabnanny.py b/Lib/test/test_tabnanny.py
index 59fdfc5573d373893d7739b9d6691e736ee38c40..e0a82e95c486be325aee0a211c890a215cfc3981 100644 (file)
--- a/Lib/test/test_tabnanny.py
+++ b/Lib/test/test_tabnanny.py
@@ -4,7 +4,6 @@ Glossary:
     * errored    : Whitespace related problems present in file.
 """
 from unittest import TestCase, mock
-from unittest import mock
 import errno
 import os
 import tabnanny