Skip to content

bpo-32482: Fix suspicious code in tests for syntax and grammar. #5086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 4, 2018
Merged

bpo-32482: Fix suspicious code in tests for syntax and grammar. #5086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Lib/test/test_grammar.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,10 @@ def f(*args, **kwargs):
self.assertEqual(f(spam='fried', **{'eggs':'scrambled'}),
((), {'eggs':'scrambled', 'spam':'fried'}))

# Check ast errors in *args and *kwargs
check_syntax_error(self, "f(*g(1=2))")
check_syntax_error(self, "f(**g(1=2))")

# argument annotation tests
def f(x) -> list: pass
self.assertEqual(f.__annotations__, {'return': list})
Expand Down Expand Up @@ -616,10 +620,6 @@ def f(x=1): return closure
def f(*, k=1): return closure
def f() -> int: return closure

# Check ast errors in *args and *kwargs
check_syntax_error(self, "f(*g(1=2))")
check_syntax_error(self, "f(**g(1=2))")

# Check trailing commas are permitted in funcdef argument list
def f(a,): pass
def f(*args,): pass
Expand Down Expand Up @@ -1017,7 +1017,6 @@ def test_try(self):
try: 1/0
except EOFError: pass
except TypeError as msg: pass
except RuntimeError as msg: pass
except: pass
else: pass
try: 1/0
Expand Down Expand Up @@ -1126,7 +1125,7 @@ def test_selectors(self):
d[1,2] = 3
d[1,2,3] = 4
L = list(d)
L.sort(key=lambda x: x if isinstance(x, tuple) else ())
L.sort(key=lambda x: (type(x).__name__, x))
self.assertEqual(str(L), '[1, (1,), (1, 2), (1, 2, 3)]')

def test_atoms(self):
Expand Down
4 changes: 2 additions & 2 deletions Lib/test/test_syntax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,12 +668,12 @@ def test_kwargs_last(self):
"positional argument follows keyword argument")

def test_kwargs_last2(self):
self._check_error("int(**{base: 10}, '2')",
self._check_error("int(**{'base': 10}, '2')",
"positional argument follows "
"keyword argument unpacking")

def test_kwargs_last3(self):
self._check_error("int(**{base: 10}, *['2'])",
self._check_error("int(**{'base': 10}, *['2'])",
"iterable argument unpacking follows "
"keyword argument unpacking")

Expand Down