bpo-32482: Fix suspicious code in tests for syntax and grammar. (#5086)
diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py
index 9f26e9c..88c22b8 100644
--- a/Lib/test/test_grammar.py
+++ b/Lib/test/test_grammar.py
@@ -575,6 +575,10 @@
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})
@@ -616,10 +620,6 @@
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
@@ -1091,7 +1091,6 @@
try: 1/0
except EOFError: pass
except TypeError as msg: pass
- except RuntimeError as msg: pass
except: pass
else: pass
try: 1/0
@@ -1200,7 +1199,7 @@
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):
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
index e161f56..2b96a94 100644
--- a/Lib/test/test_syntax.py
+++ b/Lib/test/test_syntax.py
@@ -668,12 +668,12 @@
"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")