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

2 files changed, 5 insertions, 29 deletions

diff --git a/Lib/importlib/test/frozen/support.py b/Lib/importlib/test/frozen/support.py
deleted file mode 100644
index e08b89e..0000000
--- a/Lib/importlib/test/frozen/support.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-
-
-class Null:
-
-    """Just absorb what is given."""
-
-    def __getattr__(self):
-        return lambda *args, **kwargs: None
-
-
-class SilenceStdout:
-
-    """Silence sys.stdout."""
-
-    def setUp(self):
-        """Substitute sys.stdout with something that does not print to the
-        screen thanks to what bytecode is frozen."""
-        sys.stdout = Null()
-        super().setUp()
-
-    def tearDown(self):
-        sys.stdout = sys.__stdout__
-        super().tearDown()
diff --git a/Lib/importlib/test/frozen/test_loader.py b/Lib/importlib/test/frozen/test_loader.py
index 63a9742..c6f4463 100644
--- a/Lib/importlib/test/frozen/test_loader.py
+++ b/Lib/importlib/test/frozen/test_loader.py
@@ -1,12 +1,12 @@
 from importlib import machinery
 from .. import abc
-from .. import support
+from .. import util
 
 
 class LoaderTests(abc.LoaderTests):
 
     def test_module(self):
-        with support.uncache('__hello__'):
+        with util.uncache('__hello__'):
             module = machinery.FrozenImporter.load_module('__hello__')
             check = {'__name__': '__hello__', '__file__': '<frozen>',
                         '__package__': None}
@@ -14,7 +14,7 @@ class LoaderTests(abc.LoaderTests):
                 self.assertEqual(getattr(module, attr), value)
 
     def test_package(self):
-        with support.uncache('__phello__'):
+        with util.uncache('__phello__'):
             module = machinery.FrozenImporter.load_module('__phello__')
             check = {'__name__': '__phello__', '__file__': '<frozen>',
                      '__package__': '__phello__', '__path__': ['__phello__']}
@@ -25,7 +25,7 @@ class LoaderTests(abc.LoaderTests):
                                  (attr, attr_value, value))
 
     def test_lacking_parent(self):
-        with support.uncache('__phello__', '__phello__.spam'):
+        with util.uncache('__phello__', '__phello__.spam'):
             module = machinery.FrozenImporter.load_module('__phello__.spam')
             check = {'__name__': '__phello__.spam', '__file__': '<frozen>',
                      '__package__': '__phello__'}
@@ -36,7 +36,7 @@ class LoaderTests(abc.LoaderTests):
                                  (attr, attr_value, value))
 
     def test_module_reuse(self):
-        with support.uncache('__hello__'):
+        with util.uncache('__hello__'):
             module1 = machinery.FrozenImporter.load_module('__hello__')
             module2 = machinery.FrozenImporter.load_module('__hello__')
             self.assert_(module1 is module2)