bpo-45019: Clean up the frozen __hello__ module. (gh-28374)

Here's one more small cleanup that should have been in PR gh-28319. We eliminate stdout side-effects from importing the frozen __hello__ module, and update tests accordingly. We also move the module's source file into Lib/ from Toos/freeze/flag.py.

https://bugs.python.org/issue45019

3 files changed, 28 insertions, 17 deletions

diff --git a/Python/frozen_modules/MANIFEST b/Python/frozen_modules/MANIFEST
index 811dc5b..b723684 100644
--- a/Python/frozen_modules/MANIFEST
+++ b/Python/frozen_modules/MANIFEST
@@ -15,6 +15,6 @@ genericpath                  no  <genericpath>                   genericpath.h
 ntpath                       no  <ntpath>                        ntpath.h                        15b9b80fa9c2
 posixpath                    no  <posixpath>                     posixpath.h                     3fc077252afd
 stat                         no  <stat>                          stat.h                          27c32a0815c2
-__hello__                    no  Tools/freeze/flag.py            hello.h                         af6fb665713f
-__phello__                  YES  Tools/freeze/flag.py            hello.h                         af6fb665713f
-__phello__.spam              no  Tools/freeze/flag.py            hello.h                         af6fb665713f
+__hello__                    no  <__hello__>                     __hello__.h                     81ba13956479
+__phello__                  YES  <__hello__>                     __hello__.h                     81ba13956479
+__phello__.spam              no  <__hello__>                     __hello__.h                     81ba13956479
diff --git a/Python/frozen_modules/__hello__.h b/Python/frozen_modules/__hello__.h
new file mode 100644
index 0000000..eea1029
--- /dev/null
+++ b/Python/frozen_modules/__hello__.h
@@ -0,0 +1,25 @@
+/* Auto-generated by Programs/_freeze_module.c */
+const unsigned char _Py_M____hello__[] = {
+    99,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,
+    0,0,0,0,0,115,32,0,0,0,100,0,90,0,100,1,
+    132,0,90,1,101,2,100,2,107,2,114,14,101,1,131,0,
+    1,0,100,3,83,0,100,3,83,0,41,4,84,99,0,0,
+    0,0,0,0,0,0,0,0,0,0,2,0,0,0,3,0,
+    0,0,115,12,0,0,0,116,0,100,1,131,1,1,0,100,
+    0,83,0,41,2,78,122,12,72,101,108,108,111,32,119,111,
+    114,108,100,33,41,1,218,5,112,114,105,110,116,169,0,243,
+    0,0,0,0,250,18,60,102,114,111,122,101,110,32,95,95,
+    104,101,108,108,111,95,95,62,218,4,109,97,105,110,114,4,
+    0,0,0,3,0,0,0,243,2,0,0,0,12,1,114,5,
+    0,0,0,115,12,0,0,0,5,10,11,25,5,26,5,26,
+    5,26,5,26,114,2,0,0,0,90,8,95,95,109,97,105,
+    110,95,95,78,41,3,90,11,105,110,105,116,105,97,108,105,
+    122,101,100,114,4,0,0,0,218,8,95,95,110,97,109,101,
+    95,95,114,1,0,0,0,114,2,0,0,0,114,3,0,0,
+    0,218,8,60,109,111,100,117,108,101,62,114,7,0,0,0,
+    1,0,0,0,115,10,0,0,0,4,0,6,2,8,3,10,
+    1,4,255,115,8,0,0,0,4,0,6,3,6,2,16,1,
+    115,32,0,0,0,15,19,1,12,1,26,1,26,1,26,4,
+    12,16,26,4,26,1,11,5,9,5,11,5,11,5,11,5,
+    11,1,11,1,11,114,2,0,0,0,
+};
diff --git a/Python/frozen_modules/hello.h b/Python/frozen_modules/hello.h
deleted file mode 100644
index 2658c05..0000000
--- a/Python/frozen_modules/hello.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* Auto-generated by Programs/_freeze_module.c */
-const unsigned char _Py_M__hello[] = {
-    99,0,0,0,0,0,0,0,0,0,0,0,0,2,0,0,
-    0,0,0,0,0,115,16,0,0,0,100,0,90,0,101,1,
-    100,1,131,1,1,0,100,2,83,0,41,3,84,122,12,72,
-    101,108,108,111,32,119,111,114,108,100,33,78,41,2,90,11,
-    105,110,105,116,105,97,108,105,122,101,100,218,5,112,114,105,
-    110,116,169,0,243,0,0,0,0,122,14,60,102,114,111,122,
-    101,110,32,104,101,108,108,111,62,218,8,60,109,111,100,117,
-    108,101,62,114,3,0,0,0,1,0,0,0,243,4,0,0,
-    0,4,0,12,1,114,4,0,0,0,115,16,0,0,0,15,
-    19,1,12,1,6,7,21,1,22,1,22,1,22,1,22,114,
-    2,0,0,0,
-};