Updated tests; removed try/catch for ucollections

tests/basics/class_store_class.py

@@ -5,11 +5,8 @@
 try:
     from collections import namedtuple
 except ImportError:
-    try:
+    print("SKIP")
-        from ucollections import namedtuple
+    raise SystemExit
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
 
 import skip_if
 skip_if.no_cpython_compat()

tests/basics/namedtuple1.py

@@ -1,8 +1,5 @@
 try:
-    try:
+    from collections import namedtuple
-        from collections import namedtuple
-    except ImportError:
-        from ucollections import namedtuple
 except ImportError:
     print("SKIP")
     raise SystemExit

tests/basics/namedtuple1_cpython_compat.py

@@ -2,10 +2,7 @@ import skip_if
 skip_if.no_cpython_compat()
 
 try:
-    try:
+    from collections import namedtuple
-        from collections import namedtuple
-    except ImportError:
-        from ucollections import namedtuple
 except ImportError:
     skip_if.skip()
 

tests/basics/ordereddict1.py

@@ -1,11 +1,8 @@
 try:
     from collections import OrderedDict
 except ImportError:
-    try:
+    print("SKIP")
-        from ucollections import OrderedDict
+    raise SystemExit
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
 
 d = OrderedDict([(10, 20), ("b", 100), (1, 2)])
 print(len(d))

tests/basics/ordereddict_eq.py

@@ -1,11 +1,8 @@
 try:
     from collections import OrderedDict
 except ImportError:
-    try:
+    print("SKIP")
-        from ucollections import OrderedDict
+    raise SystemExit
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
 
 x = OrderedDict()
 y = OrderedDict()

tests/bench/var-8-namedtuple-1st.py

@@ -1,5 +1,5 @@
 import bench
-from ucollections import namedtuple
+from collections import namedtuple
 
 T = namedtuple("Tup", ["num", "bar"])
 

tests/bench/var-8.1-namedtuple-5th.py

@@ -1,5 +1,5 @@
 import bench
-from ucollections import namedtuple
+from collections import namedtuple
 
 T = namedtuple("Tup", ["foo1", "foo2", "foo3", "foo4", "num"])
 

tests/skip_if.py

@@ -68,10 +68,7 @@ def board_not_in(*board):
 
 def no_cpython_compat():
     try:
-        try:
+        from collections import namedtuple
-            from collections import namedtuple
-        except ImportError:
-            from ucollections import namedtuple
     except ImportError:
         skip()
     try: