1 files changed, 3 insertions, 34 deletions
diff --git a/Lib/test/test_complex_args.py b/Lib/test/test_complex_args.py
index f6950a7..c6d50a9 100644
--- a/Lib/test/test_complex_args.py
+++ b/Lib/test/test_complex_args.py
@@ -1,31 +1,23 @@
 
 import unittest
 from test import test_support
-import textwrap
-import warnings
 
 class ComplexArgsTestCase(unittest.TestCase):
 
     def check(self, func, expected, *args):
         self.assertEqual(func(*args), expected)
 
-    # These functions are tested below as lambdas too.  If you add a
-    # function test, also add a similar lambda test.
-
-    # Functions are wrapped in "exec" statements in order to
-    # silence Py3k warnings
+    # These functions are tested below as lambdas too.  If you add a function test,
+    # also add a similar lambda test.
 
     def test_func_parens_no_unpacking(self):
-        exec textwrap.dedent("""
         def f(((((x))))): return x
         self.check(f, 1, 1)
         # Inner parens are elided, same as: f(x,)
         def f(((x)),): return x
         self.check(f, 2, 2)
-        """)
 
     def test_func_1(self):
-        exec textwrap.dedent("""
         def f(((((x),)))): return x
         self.check(f, 3, (3,))
         def f(((((x)),))): return x
@@ -34,22 +26,16 @@ class ComplexArgsTestCase(unittest.TestCase):
         self.check(f, 5, (5,))
         def f(((x),)): return x
         self.check(f, 6, (6,))
-        """)
 
     def test_func_2(self):
-        exec textwrap.dedent("""
         def f(((((x)),),)): return x
         self.check(f, 2, ((2,),))
-        """)
 
     def test_func_3(self):
-        exec textwrap.dedent("""
         def f((((((x)),),),)): return x
         self.check(f, 3, (((3,),),))
-        """)
 
     def test_func_complex(self):
-        exec textwrap.dedent("""
         def f((((((x)),),),), a, b, c): return x, a, b, c
         self.check(f, (3, 9, 8, 7), (((3,),),), 9, 8, 7)
 
@@ -58,22 +44,18 @@ class ComplexArgsTestCase(unittest.TestCase):
 
         def f(a, b, c, ((((((x)),)),),)): return a, b, c, x
         self.check(f, (9, 8, 7, 3), 9, 8, 7, (((3,),),))
-        """)
 
     # Duplicate the tests above, but for lambda.  If you add a lambda test,
     # also add a similar function test above.
 
     def test_lambda_parens_no_unpacking(self):
-        exec textwrap.dedent("""
         f = lambda (((((x))))): x
         self.check(f, 1, 1)
         # Inner parens are elided, same as: f(x,)
         f = lambda ((x)),: x
         self.check(f, 2, 2)
-        """)
 
     def test_lambda_1(self):
-        exec textwrap.dedent("""
         f = lambda (((((x),)))): x
         self.check(f, 3, (3,))
         f = lambda (((((x)),))): x
@@ -82,22 +64,16 @@ class ComplexArgsTestCase(unittest.TestCase):
         self.check(f, 5, (5,))
         f = lambda (((x),)): x
         self.check(f, 6, (6,))
-        """)
 
     def test_lambda_2(self):
-        exec textwrap.dedent("""
         f = lambda (((((x)),),)): x
         self.check(f, 2, ((2,),))
-        """)
 
     def test_lambda_3(self):
-        exec textwrap.dedent("""
         f = lambda ((((((x)),),),)): x
         self.check(f, 3, (((3,),),))
-        """)
 
     def test_lambda_complex(self):
-        exec textwrap.dedent("""
         f = lambda (((((x)),),),), a, b, c: (x, a, b, c)
         self.check(f, (3, 9, 8, 7), (((3,),),), 9, 8, 7)
 
@@ -106,17 +82,10 @@ class ComplexArgsTestCase(unittest.TestCase):
 
         f = lambda a, b, c, ((((((x)),)),),): (a, b, c, x)
         self.check(f, (9, 8, 7, 3), 9, 8, 7, (((3,),),))
-        """)
 
 
 def test_main():
-    with warnings.catch_warnings():
-        # Silence Py3k warnings
-        warnings.filterwarnings("ignore", "tuple parameter unpacking "
-                                "has been removed", SyntaxWarning)
-        warnings.filterwarnings("ignore", "parenthesized argument names "
-                                "are invalid", SyntaxWarning)
-        test_support.run_unittest(ComplexArgsTestCase)
+    test_support.run_unittest(ComplexArgsTestCase)
 
 if __name__ == "__main__":
     test_main()