[Python-checkins] cpython: Fix remaining tests and remove an unused import.

[berker.peksag]

https://hg.python.org/cpython/rev/1320ec1b24af
changeset:   95890:1320ec1b24af
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Wed May 06 07:01:52 2015 +0300
summary:
  Fix remaining tests and remove an unused import.

files:
  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
--- a/Lib/test/_test_multiprocessing.py
+++ b/Lib/test/_test_multiprocessing.py
@@ -19,7 +19,7 @@
 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 @@
         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
--- a/Lib/test/support/script_helper.py
+++ b/Lib/test/support/script_helper.py
@@ -14,7 +14,7 @@
 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
--- a/Lib/test/test_compile.py
+++ b/Lib/test/test_compile.py
@@ -5,7 +5,8 @@
 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
--- 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
 

-- 
Repository URL: https://hg.python.org/cpython