From 076dbd05600337057723b831bfad6f6cb1873100 Mon Sep 17 00:00:00 2001
From: Berker Peksag <berker.peksag@gmail.com>
Date: Wed, 6 May 2015 07:01:52 +0300
Subject: Fix remaining tests and remove an unused import.

---
 Lib/test/_test_multiprocessing.py | 6 +++---
 Lib/test/support/script_helper.py | 2 +-
 Lib/test/test_compile.py          | 3 ++-
 Lib/test/test_tools/test_i18n.py  | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py
index b66cb40..e9120ab 100644
--- 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 07d167d..584b0e8 100644
--- 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 41a92ff..98a4df8 100644
--- 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 e88e2b1..6eaa8dd 100644
--- 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
 
-- 
cgit v0.12