bpo-45019: Silence a warning in test_ctypes.

Lib/ctypes/test/test_values.py

@@ -2,12 +2,12 @@
 A testcase which accesses *values* in a dll.
 """
 
-import imp
+import _imp
 import importlib.util
 import unittest
 import sys
 from ctypes import *
-from test.support import import_helper, captured_stdout
+from test.support import import_helper
 
 import _ctypes_test
 
@@ -73,6 +73,7 @@ class struct_frozen(Structure):
                 self.assertTrue([entry.code[i] for i in range(abs(entry.size))])
                 # Check the module's package-ness.
                 with import_helper.frozen_modules():
+                    # Hide the message written by the __hello__ module.
                     spec = importlib.util.find_spec(modname)
                 if entry.size < 0:
                     # It's a package.
@@ -81,7 +82,7 @@ class struct_frozen(Structure):
                     self.assertIsNone(spec.submodule_search_locations)
 
         with import_helper.frozen_modules():
-            expected = imp._frozen_module_names()
+            expected = _imp._frozen_module_names()
         self.maxDiff = None
         self.assertEqual(modules, expected, "PyImport_FrozenModules example "
             "in Doc/library/ctypes.rst may be out of date")

Lib/test/test_frozen.py

@@ -21,8 +21,9 @@ def test_frozen(self):
         if name in sys.modules:
             del sys.modules[name]
         with import_helper.frozen_modules():
-            with captured_stdout() as out:
-                import __hello__
+            import __hello__
+        with captured_stdout() as out:
+            __hello__.main()
         self.assertEqual(out.getvalue(), 'Hello world!\n')
 
 

Lib/test/test_importlib/frozen/test_loader.py

@@ -21,12 +21,11 @@ def deprecated():
 def fresh(name, *, oldapi=False):
     with util.uncache(name):
         with import_helper.frozen_modules():
-            with captured_stdout() as stdout:
-                if oldapi:
-                    with deprecated():
-                        yield stdout
-                else:
-                    yield stdout
+            if oldapi:
+                with deprecated():
+                    yield
+            else:
+                yield
 
 
 class ExecModuleTests(abc.LoaderTests):
@@ -44,8 +43,10 @@ def exec_module(self, name):
         module.__spec__ = spec
         assert not hasattr(module, 'initialized')
 
-        with fresh(name) as stdout:
+        with fresh(name):
             self.machinery.FrozenImporter.exec_module(module)
+        with captured_stdout() as stdout:
+            module.main()
 
         self.assertTrue(module.initialized)
         self.assertTrue(hasattr(module, '__spec__'))
@@ -119,8 +120,10 @@ def test_unloadable(self):
 class LoaderTests(abc.LoaderTests):
 
     def load_module(self, name):
-        with fresh(name, oldapi=True) as stdout:
+        with fresh(name, oldapi=True):
             module = self.machinery.FrozenImporter.load_module(name)
+        with captured_stdout() as stdout:
+            module.main()
         return module, stdout
 
     def test_module(self):
@@ -165,15 +168,18 @@ def test_lacking_parent(self):
         self.assertFalse(hasattr(module, '__file__'))
 
     def test_module_reuse(self):
-        with fresh('__hello__', oldapi=True) as stdout:
+        with fresh('__hello__', oldapi=True):
             module1 = self.machinery.FrozenImporter.load_module('__hello__')
             module2 = self.machinery.FrozenImporter.load_module('__hello__')
+        with captured_stdout() as stdout:
+            module1.main()
+            module2.main()
         self.assertIs(module1, module2)
         self.assertEqual(stdout.getvalue(),
                          'Hello world!\nHello world!\n')
 
     def test_module_repr(self):
-        with fresh('__hello__', oldapi=True) as stdout:
+        with fresh('__hello__', oldapi=True):
             module = self.machinery.FrozenImporter.load_module('__hello__')
             repr_str = self.machinery.FrozenImporter.module_repr(module)
         self.assertEqual(repr_str,
@@ -203,11 +209,12 @@ class InspectLoaderTests:
     def test_get_code(self):
         # Make sure that the code object is good.
         name = '__hello__'
+        with import_helper.frozen_modules():
+            code = self.machinery.FrozenImporter.get_code(name)
+            mod = types.ModuleType(name)
+            exec(code, mod.__dict__)
         with captured_stdout() as stdout:
-            with import_helper.frozen_modules():
-                code = self.machinery.FrozenImporter.get_code(name)
-                mod = types.ModuleType(name)
-                exec(code, mod.__dict__)
+            mod.main()
         self.assertTrue(hasattr(mod, 'initialized'))
         self.assertEqual(stdout.getvalue(), 'Hello world!\n')
 

Tools/freeze/flag.py

@@ -1,2 +1,7 @@
 initialized = True
-print("Hello world!")
+
+def main():
+    print("Hello world!")
+
+if __name__ == '__main__':
+    main()

Tools/freeze/hello.py

@@ -1 +1,5 @@
-print('Hello world...')
+def main():
+    print("Hello world!")
+
+if __name__ == '__main__':
+    main()