Merge remote-tracking branch 'upstream/master'

5 files changed, 5 insertions, 8 deletions

diff --git a/tests/misc/non_compliant.py b/tests/misc/non_compliant.py
index 31074ab01..b4c90e9fc 100644
--- a/tests/misc/non_compliant.py
+++ b/tests/misc/non_compliant.py
@@ -4,9 +4,8 @@ try:
     import array
     import ustruct
 except ImportError:
-    import sys
     print("SKIP")
-    sys.exit()
+    raise SystemExit
 
 # when super can't find self
 try:
diff --git a/tests/misc/print_exception.py b/tests/misc/print_exception.py
index b833a7981..9ab8e728b 100644
--- a/tests/misc/print_exception.py
+++ b/tests/misc/print_exception.py
@@ -6,7 +6,7 @@ try:
         import io
 except ImportError:
     print("SKIP")
-    sys.exit()
+    raise SystemExit
 
 if hasattr(sys, 'print_exception'):
     print_exception = sys.print_exception
diff --git a/tests/misc/recursive_data.py b/tests/misc/recursive_data.py
index 383018945..3b7fa5095 100644
--- a/tests/misc/recursive_data.py
+++ b/tests/misc/recursive_data.py
@@ -2,9 +2,8 @@
 try:
     import uio as io
 except ImportError:
-    import sys
     print("SKIP")
-    sys.exit()
+    raise SystemExit
 
 l = [1, 2, 3, None]
 l[-1] = l
diff --git a/tests/misc/recursive_iternext.py b/tests/misc/recursive_iternext.py
index d90f17716..edb5a843f 100644
--- a/tests/misc/recursive_iternext.py
+++ b/tests/misc/recursive_iternext.py
@@ -6,9 +6,8 @@ try:
     max
     zip
 except:
-    import sys
     print("SKIP")
-    sys.exit()
+    raise SystemExit
 
 # We need to pick an N that is large enough to hit the recursion
 # limit, but not too large that we run out of heap memory.
diff --git a/tests/misc/sys_exc_info.py b/tests/misc/sys_exc_info.py
index de5b82562..4bb2c61e8 100644
--- a/tests/misc/sys_exc_info.py
+++ b/tests/misc/sys_exc_info.py
@@ -3,7 +3,7 @@ try:
     sys.exc_info
 except:
     print("SKIP")
-    sys.exit()
+    raise SystemExit
 
 def f():
     print(sys.exc_info()[0:2])