Revert more import sorting

Author: hugovk

Lib/test/test_import/__init__.py

@@ -27,30 +27,30 @@
 from unittest import mock
 import _imp
 
+from test.support import os_helper
 from test.support import (
     STDLIB_DIR,
-    Py_GIL_DISABLED,
-    Py_TRACE_REFS,
+    swap_attr,
+    swap_item,
     cpython_only,
-    force_not_colorized_test_class,
     is_apple_mobile,
     is_emscripten,
     is_wasi,
-    no_rerun,
-    os_helper,
-    requires_gil_enabled,
     run_in_subinterp,
     run_in_subinterp_with_config,
-    script_helper,
-    swap_attr,
-    swap_item,
-    threading_helper,
+    Py_TRACE_REFS,
+    requires_gil_enabled,
+    Py_GIL_DISABLED,
+    no_rerun,
+    force_not_colorized_test_class,
 )
 from test.support.import_helper import (
     forget, make_legacy_pyc, unlink, unload, ready_to_import,
     DirsOnSysPath, CleanImport, import_module)
 from test.support.os_helper import (
     TESTFN, rmtree, temp_umask, TESTFN_UNENCODABLE)
+from test.support import script_helper
+from test.support import threading_helper
 from test.test_importlib.util import uncache
 from types import ModuleType
 try:

Lib/test/test_unicodedata.py

@@ -7,17 +7,17 @@
 """
 
 import hashlib
+from http.client import HTTPException
 import sys
 import unicodedata
 import unittest
-from http.client import HTTPException
 from test.support import (
-    check_disallow_instantiation,
-    cpython_only,
-    force_not_colorized,
     open_urlresource,
     requires_resource,
     script_helper,
+    cpython_only,
+    check_disallow_instantiation,
+    force_not_colorized,
 )
 
 

Lib/test/test_unittest/test_program.py

@@ -4,11 +4,10 @@
 from test import support
 import unittest
 import test.test_unittest
-from test.support import force_not_colorized_test_class
 from test.test_unittest.test_result import BufferedWriter
 
 
-@force_not_colorized_test_class
+@support.force_not_colorized_test_class
 class Test_TestProgram(unittest.TestCase):
 
     def test_discovery_from_dotted_path(self):