From fe7b40533cdd61c7cc69171e476a965389146a28 Mon Sep 17 00:00:00 2001 From: Amaury Forgeot d'Arc Date: Fri, 10 Sep 2010 19:47:43 +0000 Subject: [PATCH] The "if 1": trick seems cleaner that the one with regular expressions. Use it here again. --- Lib/test/test_syntax.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 7117ef3d8d7..f354311ad0f 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -550,13 +550,13 @@ def test_assign_del(self): def test_global_err_then_warn(self): # Bug tickler: The SyntaxError raised for one global statement # shouldn't be clobbered by a SyntaxWarning issued for a later one. - source = re.sub('(?m)^ *:', '', """\ - :def error(a): - : global a # SyntaxError - :def warning(): - : b = 1 - : global b # SyntaxWarning - :""") + source = """if 1: + def error(a): + global a # SyntaxError + def warning(): + b = 1 + global b # SyntaxWarning + """ warnings.filterwarnings(action='ignore', category=SyntaxWarning) self._check_error(source, "global") warnings.filters.pop(0) @@ -565,12 +565,12 @@ def test_break_outside_loop(self): self._check_error("break", "outside loop") def test_delete_deref(self): - source = re.sub('(?m)^ *:', '', """\ - :def foo(x): - : def bar(): - : print(x) - : del x - :""") + source = """if 1: + def foo(x): + def bar(): + print(x) + del x + """ self._check_error(source, "nested scope") def test_unexpected_indent(self):