Fix remaining tests and remove an unused import.

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index b66cb408dddb6006eb9339abe31537bcc499bd54..e9120abe5d9cc6e45031441cab1f720f64b9f2b2 100644 (file)
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -19,7 +19,7 @@ import logging
 import struct
 import operator
 import test.support
-import test.script_helper
+import test.support.script_helper
 
 
 # Skip tests if _multiprocessing wasn't built.
@@ -3483,11 +3483,11 @@ class TestNoForkBomb(unittest.TestCase):
         sm = multiprocessing.get_start_method()
         name = os.path.join(os.path.dirname(__file__), 'mp_fork_bomb.py')
         if sm != 'fork':
-            rc, out, err = test.script_helper.assert_python_failure(name, sm)
+            rc, out, err = test.support.script_helper.assert_python_failure(name, sm)
             self.assertEqual(out, b'')
             self.assertIn(b'RuntimeError', err)
         else:
-            rc, out, err = test.script_helper.assert_python_ok(name, sm)
+            rc, out, err = test.support.script_helper.assert_python_ok(name, sm)
             self.assertEqual(out.rstrip(), b'123')
             self.assertEqual(err, b'')
 

diff --git a/Lib/test/support/script_helper.py b/Lib/test/support/script_helper.py
index 07d167d9368c1470aa2e671921e0f50e642ff985..584b0e8eefa60c1398f785d442618381f2ce8eb1 100644 (file)
--- a/Lib/test/support/script_helper.py
+++ b/Lib/test/support/script_helper.py
@@ -14,7 +14,7 @@ import shutil
 import zipfile
 
 from importlib.util import source_from_cache
-from test.support import make_legacy_pyc, strip_python_stderr, temp_dir
+from test.support import make_legacy_pyc, strip_python_stderr
 
 
 # Cached result of the expensive test performed in the function below.

diff --git a/Lib/test/test_compile.py b/Lib/test/test_compile.py
index 41a92ffe259506427bd20b83b0c862bf81386357..98a4df899a5951dbb7edb201ddb58ad9fba5f2a3 100644 (file)
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -5,7 +5,8 @@ import sys
 import _ast
 import tempfile
 import types
-from test import support, script_helper
+from test import support
+from test.support import script_helper
 
 class TestSpecifics(unittest.TestCase):
 

diff --git a/Lib/test/test_tools/test_i18n.py b/Lib/test/test_tools/test_i18n.py
index e88e2b1e14b1ac640ea0e8b2c557ec171e36b447..6eaa8ddcc617adf9374215a339e0f506a1ad9c58 100644 (file)
--- a/Lib/test/test_tools/test_i18n.py
+++ b/Lib/test/test_tools/test_i18n.py
@@ -3,7 +3,7 @@
 import os
 import unittest
 
-from test.script_helper import assert_python_ok
+from test.support.script_helper import assert_python_ok
 from test.test_tools import toolsdir
 from test.support import temp_cwd