Fix the frozen bytecode for __hello__ (betcha didn't know that existed

:-).

Add a test that prevents the __hello__ bytecode from going stale
unnoticed again.

The test also tests the loophole noted in SF bug #404545.  This test
will fail right now; I'll check in the fix in a minute.

3 files changed, 31 insertions, 0 deletions

diff --git a/Lib/__phello__.foo.py b/Lib/__phello__.foo.py
new file mode 100644
index 0000000..8e8623e
--- /dev/null
+++ b/Lib/__phello__.foo.py
@@ -0,0 +1 @@
+# This file exists as a helper for the test.test_frozen module.
diff --git a/Lib/test/output/test_frozen b/Lib/test/output/test_frozen
new file mode 100644
index 0000000..76f17db
--- /dev/null
+++ b/Lib/test/output/test_frozen
@@ -0,0 +1,4 @@
+test_frozen
+Hello world...
+Hello world...
+Hello world...
diff --git a/Lib/test/test_frozen.py b/Lib/test/test_frozen.py
new file mode 100644
index 0000000..3aa91ab
--- /dev/null
+++ b/Lib/test/test_frozen.py
@@ -0,0 +1,26 @@
+# Test the frozen module defined in frozen.c.
+
+from test_support import TestFailed
+import sys, os
+
+try:
+    import __hello__
+except ImportError, x:
+    raise TestFailed, "import __hello__ failed:", x
+
+try:
+    import __phello__
+except ImportError, x:
+    raise TestFailed, "import __phello__ failed:", x
+
+try:
+    import __phello__.spam
+except ImportError, x:
+    raise TestFailed, "import __phello__.spam failed:", x
+
+try:
+    import __phello__.foo
+except ImportError:
+    pass
+else:
+    raise TestFailed, "import __phello__.foo should have failed"