mirror of
https://github.com/python/cpython.git
synced 2025-08-01 07:33:08 +00:00
Silence some py3k SyntaxWarning using check_py3k_warnings() with "exec" statements.
This commit is contained in:
parent
8f43cec41b
commit
af61719ec3
2 changed files with 35 additions and 3 deletions
|
@ -1,23 +1,30 @@
|
|||
|
||||
import unittest
|
||||
from test import test_support
|
||||
import textwrap
|
||||
|
||||
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.
|
||||
# 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.
|
||||
|
||||
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
|
||||
|
@ -26,16 +33,22 @@ 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)
|
||||
|
||||
|
@ -44,18 +57,22 @@ 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
|
||||
|
@ -64,16 +81,22 @@ 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)
|
||||
|
||||
|
@ -82,10 +105,14 @@ 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():
|
||||
test_support.run_unittest(ComplexArgsTestCase)
|
||||
with test_support.check_py3k_warnings(
|
||||
("tuple parameter unpacking has been removed", SyntaxWarning),
|
||||
("parenthesized argument names are invalid", SyntaxWarning)):
|
||||
test_support.run_unittest(ComplexArgsTestCase)
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_main()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue