[Python-checkins] [3.9] bpo-46198: rename duplicate tests and remove unused code (GH-30297) (GH-31797)

[JelleZijlstra]

https://github.com/python/cpython/commit/f7f7838b41d45efa129a61f104136f8e12f3488a
commit: f7f7838b41d45efa129a61f104136f8e12f3488a
branch: 3.9
author: Jelle Zijlstra <jelle.zijlstra at gmail.com>
committer: JelleZijlstra <jelle.zijlstra at gmail.com>
date: 2022-03-10T13:18:27-08:00
summary:

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

(cherry picked from commit 6c83c8e6b56b57a8a794e7b6c07837be4ce3bb97)

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

files:
M Lib/test/datetimetester.py
M Lib/test/support/__init__.py
M Lib/test/test_asyncio/test_sslproto.py
M Lib/test/test_codecs.py
M Lib/test/test_dict.py
M Lib/test/test_email/test__header_value_parser.py
M Lib/test/test_tabnanny.py

diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index 85241526739cb..361d5e9ba7e0a 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -1861,8 +1861,6 @@ def test_fromisoformat_fails(self):
 
     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 @@ def test_fromisoformat_fails(self):
 
     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 c4115a850b2e4..86ac8f096695f 100644
--- a/Lib/test/support/__init__.py
+++ b/Lib/test/support/__init__.py
@@ -2390,9 +2390,6 @@ def __init__(self, link=None):
 
         self._platform_specific()
 
-    def _platform_specific(self):
-        pass
-
     if sys.platform == "win32":
         def _platform_specific(self):
             import _winapi
@@ -2419,6 +2416,9 @@ def _platform_specific(self):
             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 bc01a8bbf2d35..d658a00de96b5 100644
--- 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 2f7f93a29f662..fc50e70df24b9 100644
--- a/Lib/test/test_codecs.py
+++ b/Lib/test/test_codecs.py
@@ -30,7 +30,7 @@ def check(input, expect):
 # 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_dict.py b/Lib/test/test_dict.py
index d05ed302ede84..a3014cb09f985 100644
--- a/Lib/test/test_dict.py
+++ b/Lib/test/test_dict.py
@@ -1435,7 +1435,7 @@ def test_dict_items_result_gc(self):
         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 1bdcfa129b4c8..854f2ff009c61 100644
--- a/Lib/test/test_email/test__header_value_parser.py
+++ b/Lib/test/test_email/test__header_value_parser.py
@@ -395,7 +395,7 @@ def test_get_unstructured_without_trailing_whitespace_hang_case(self):
             [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_tabnanny.py b/Lib/test/test_tabnanny.py
index 7f3308d745aa0..6dab678c33067 100644
--- a/Lib/test/test_tabnanny.py
+++ b/Lib/test/test_tabnanny.py
@@ -4,7 +4,6 @@
     * errored    : Whitespace related problems present in file.
 """
 from unittest import TestCase, mock
-from unittest import mock
 import errno
 import os
 import tabnanny