Rename importlib.test.support to importlib.test.util.

6 files changed, 6 insertions, 9 deletions

diff --git a/Lib/importlib/test/source/test_case_sensitivity.py b/Lib/importlib/test/source/test_case_sensitivity.py
index 955d6ec..6bd86cf 100644
--- a/Lib/importlib/test/source/test_case_sensitivity.py
+++ b/Lib/importlib/test/source/test_case_sensitivity.py
@@ -1,6 +1,6 @@
 """Test case-sensitivity (PEP 235)."""
 import importlib
-from .. import support
+from .. import util
 from . import util as source_util
 import os
 import sys
@@ -8,7 +8,7 @@ from test import support as test_support
 import unittest
 
 
-@support.case_insensitive_tests
+@util.case_insensitive_tests
 class CaseSensitivityTest(unittest.TestCase):
 
     """PEP 235 dictates that on case-preserving, case-insensitive file systems
diff --git a/Lib/importlib/test/source/test_finder.py b/Lib/importlib/test/source/test_finder.py
index a84d914..0f1f549 100644
--- a/Lib/importlib/test/source/test_finder.py
+++ b/Lib/importlib/test/source/test_finder.py
@@ -1,6 +1,5 @@
 import importlib
 from .. import abc
-from .. import support
 from . import util as source_util
 import os
 import py_compile
diff --git a/Lib/importlib/test/source/test_loader.py b/Lib/importlib/test/source/test_loader.py
index 67930fc..e333b85 100644
--- a/Lib/importlib/test/source/test_loader.py
+++ b/Lib/importlib/test/source/test_loader.py
@@ -1,6 +1,5 @@
 import importlib
 from .. import abc
-from .. import support
 from . import util as source_util
 
 import imp
diff --git a/Lib/importlib/test/source/test_path_hook.py b/Lib/importlib/test/source/test_path_hook.py
index 5fa3fd9..5aac42e 100644
--- a/Lib/importlib/test/source/test_path_hook.py
+++ b/Lib/importlib/test/source/test_path_hook.py
@@ -1,5 +1,5 @@
 import importlib
-from . import util
+from . import util as source_util
 import unittest
 
 
@@ -9,7 +9,7 @@ class PathHookTest(unittest.TestCase):
 
     def test_success(self):
         # XXX Only work on existing directories?
-        with util.create_modules('dummy') as mapping:
+        with source_util.create_modules('dummy') as mapping:
             self.assert_(hasattr(importlib.FileImporter(mapping['.root']),
                                  'find_module'))
 
diff --git a/Lib/importlib/test/source/test_source_encoding.py b/Lib/importlib/test/source/test_source_encoding.py
index 7c9a57b..5ffdf8f 100644
--- a/Lib/importlib/test/source/test_source_encoding.py
+++ b/Lib/importlib/test/source/test_source_encoding.py
@@ -1,5 +1,4 @@
 import importlib
-from .. import support
 from . import util as source_util
 
 import codecs
diff --git a/Lib/importlib/test/source/util.py b/Lib/importlib/test/source/util.py
index 5400c82..333647d 100644
--- a/Lib/importlib/test/source/util.py
+++ b/Lib/importlib/test/source/util.py
@@ -1,11 +1,11 @@
-from .. import support as util
+from .. import util
 import contextlib
 import imp
 import os
 import os.path
 import sys
 import tempfile
-from test import support as support
+from test import support
 
 
 def writes_bytecode(fxn):