Merge pull request #1068 from dhalbert/micropython-25ae98f-merge

Micropython 25ae98f merge

1 files changed, 29 insertions, 16 deletions

diff --git a/tests/basics/fun_error.py b/tests/basics/fun_error.py
index 367fe0b7f..3e79c727b 100644
--- a/tests/basics/fun_error.py
+++ b/tests/basics/fun_error.py
@@ -1,31 +1,44 @@
 # test errors from bad function calls
 
-def test_exc(code, exc):
-    try:
-        exec(code)
-        print("no exception")
-    except exc:
-        print("right exception")
-    except:
-        print("wrong exception")
-
 # function doesn't take keyword args
-test_exc("[].append(x=1)", TypeError)
+try:
+    [].append(x=1)
+except TypeError:
+    print('TypeError')
 
 # function with variable number of positional args given too few
-test_exc("round()", TypeError)
+try:
+    round()
+except TypeError:
+    print('TypeError')
 
 # function with variable number of positional args given too many
-test_exc("round(1, 2, 3)", TypeError)
+try:
+    round(1, 2, 3)
+except TypeError:
+    print('TypeError')
 
 # function with fixed number of positional args given wrong number
-test_exc("[].append(1, 2)", TypeError)
+try:
+    [].append(1, 2)
+except TypeError:
+    print('TypeError')
 
 # function with keyword args given extra positional args
-test_exc("[].sort(1)", TypeError)
+try:
+    [].sort(1)
+except TypeError:
+    print('TypeError')
 
 # function with keyword args given extra keyword args
-test_exc("[].sort(noexist=1)", TypeError)
+try:
+    [].sort(noexist=1)
+except TypeError:
+    print('TypeError')
 
 # kw given for positional, but a different positional is missing
-test_exc("def f(x, y): pass\nf(x=1)", TypeError)
+try:
+    def f(x, y): pass
+    f(x=1)
+except TypeError:
+    print('TypeError')