From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Fri, 10 Sep 2010 19:47:43 +0000 (+0000)
Subject: The "if 1": trick seems cleaner that the one with regular expressions.
X-Git-Tag: v3.2a3~342
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fe7b40533cdd61c7cc69171e476a965389146a28;p=python

The "if 1": trick seems cleaner that the one with regular expressions.
Use it here again.
---

diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index 7117ef3d8d..f354311ad0 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -550,13 +550,13 @@ class SyntaxTestCase(unittest.TestCase):
     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 @@ class SyntaxTestCase(unittest.TestCase):
         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):