test_global was broken by some recent checkin. Repairing.

tim-one · tim-one · commit fc35de409bc3 · 2001-03-02T01:48:16.000Z
diff --git a/Lib/test/output/test_global b/Lib/test/output/test_global
@@ -2,4 +2,4 @@ test_global
 got SyntaxError as expected
 got SyntaxError as expected
 got SyntaxError as expected
-got SyntaxError as expected
+as expected, no SyntaxError
diff --git a/Lib/test/test_global.py b/Lib/test/test_global.py
@@ -1,18 +1,24 @@
-"""Verify that warnings are issued for global statements following use"""
+"""Verify that warnings are issued for global statements following use."""
 
 from test_support import check_syntax
 
 import warnings
 
 warnings.filterwarnings("error", module="<test code>")
 
-def compile_and_catch_warning(text):
+def compile_and_check(text, should_fail=1):
     try:
         compile(text, "<test code>", "exec")
     except SyntaxError, msg:
-        print "got SyntaxError as expected"
+        if should_fail:
+            print "got SyntaxError as expected"
+        else:
+            print "raised unexpected SyntaxError:", text
     else:
-        print "expected SyntaxError"
+        if should_fail:
+            print "should have raised SyntaxError:", text
+        else:
+            print "as expected, no SyntaxError"
 
 prog_text_1 = """
 def wrong1():
@@ -21,25 +27,25 @@ def wrong1():
     global a
     global b
 """
-compile_and_catch_warning(prog_text_1)
+compile_and_check(prog_text_1)
 
 prog_text_2 = """
 def wrong2():
     print x
     global x
 """
-compile_and_catch_warning(prog_text_2)
+compile_and_check(prog_text_2)
 
 prog_text_3 = """
 def wrong3():
     print x
     x = 2
     global x
 """
-compile_and_catch_warning(prog_text_3)
+compile_and_check(prog_text_3)
 
 prog_text_4 = """
 global x
 x = 2
 """
-compile_and_catch_warning(prog_text_4)
+compile_and_check(prog_text_4, 0)
