tests: Rename "array" module to "uarray".

26 files changed, 152 insertions, 63 deletions

diff --git a/tests/basics/array1.py b/tests/basics/array1.py
index bad879035c..3370c240d3 100644
--- a/tests/basics/array1.py
+++ b/tests/basics/array1.py
@@ -1,8 +1,11 @@
 try:
-    import array
+    import uarray as array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 a = array.array('B', [1, 2, 3])
 print(a, len(a))
diff --git a/tests/basics/array_add.py b/tests/basics/array_add.py
index 76ce59f761..8335eb6b82 100644
--- a/tests/basics/array_add.py
+++ b/tests/basics/array_add.py
@@ -1,9 +1,12 @@
 # test array + array
 try:
-    import array
+    import uarray as array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 a1 = array.array('I', [1])
 a2 = array.array('I', [2])
diff --git a/tests/basics/array_construct.py b/tests/basics/array_construct.py
index 2221de9906..4985244d13 100644
--- a/tests/basics/array_construct.py
+++ b/tests/basics/array_construct.py
@@ -1,10 +1,13 @@
 # test construction of array.array from different objects
 
 try:
-    from array import array
+    from uarray import array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 # tuple, list
 print(array('b', (1, 2)))
diff --git a/tests/basics/array_construct2.py b/tests/basics/array_construct2.py
index c305b7f011..d1b1e9d158 100644
--- a/tests/basics/array_construct2.py
+++ b/tests/basics/array_construct2.py
@@ -1,8 +1,11 @@
 try:
-    from array import array
+    from uarray import array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 # construct from something with unknown length (requires generators)
 print(array('i', (i for i in range(10))))
diff --git a/tests/basics/array_construct_endian.py b/tests/basics/array_construct_endian.py
index 990d7b1ea0..82a962fbe0 100644
--- a/tests/basics/array_construct_endian.py
+++ b/tests/basics/array_construct_endian.py
@@ -1,10 +1,13 @@
 # test construction of array.array from different objects
 
 try:
-    from array import array
+    from uarray import array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 # raw copy from bytes, bytearray
 print(array('h', b'12'))
diff --git a/tests/basics/array_intbig.py b/tests/basics/array_intbig.py
index 5702a8ae63..ba7f9ef985 100644
--- a/tests/basics/array_intbig.py
+++ b/tests/basics/array_intbig.py
@@ -1,10 +1,13 @@
 # test array types QqLl that require big-ints
 
 try:
-    from array import array
+    from uarray import array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 print(array('L', [0, 2**32-1]))
 print(array('l', [-2**31, 0, 2**31-1]))
diff --git a/tests/basics/array_micropython.py b/tests/basics/array_micropython.py
index e26ad7ae96..6b3dc7a93b 100644
--- a/tests/basics/array_micropython.py
+++ b/tests/basics/array_micropython.py
@@ -1,9 +1,12 @@
 # test MicroPython-specific features of array.array
 try:
-    import array
+    import uarray as array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 # arrays of objects
 a = array.array('O')
diff --git a/tests/basics/bytearray_construct_array.py b/tests/basics/bytearray_construct_array.py
index bde5fa08bd..52eaa7c6ef 100644
--- a/tests/basics/bytearray_construct_array.py
+++ b/tests/basics/bytearray_construct_array.py
@@ -1,9 +1,12 @@
 # test construction of bytearray from different objects
 try:
-    from array import array
+    from uarray import array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 # arrays
 print(bytearray(array('b', [1, 2])))
diff --git a/tests/basics/bytearray_construct_endian.py b/tests/basics/bytearray_construct_endian.py
index 0002f19c5f..332b43e686 100644
--- a/tests/basics/bytearray_construct_endian.py
+++ b/tests/basics/bytearray_construct_endian.py
@@ -1,9 +1,12 @@
 # test construction of bytearray from different objects
 try:
-    from array import array
+    from uarray import array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 # arrays
 print(bytearray(array('h', [1, 2])))
diff --git a/tests/basics/bytes_add_array.py b/tests/basics/bytes_add_array.py
index b17556d83c..c6382bed74 100644
--- a/tests/basics/bytes_add_array.py
+++ b/tests/basics/bytes_add_array.py
@@ -1,9 +1,12 @@
 # test bytes + other
 try:
-    import array
+    import uarray as array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 # should be byteorder-neutral
 print(b"123" + array.array('h', [0x1515]))
diff --git a/tests/basics/bytes_add_endian.py b/tests/basics/bytes_add_endian.py
index 8cfffa7b6a..40b3de7d61 100644
--- a/tests/basics/bytes_add_endian.py
+++ b/tests/basics/bytes_add_endian.py
@@ -1,8 +1,11 @@
 # test bytes + other
 try:
-    import array
+    import uarray as array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 print(b"123" + array.array('i', [1]))
diff --git a/tests/basics/bytes_compare_array.py b/tests/basics/bytes_compare_array.py
index ad378de70c..6bad50b55a 100644
--- a/tests/basics/bytes_compare_array.py
+++ b/tests/basics/bytes_compare_array.py
@@ -1,8 +1,11 @@
 try:
-    import array
+    import uarray as array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 print(array.array('b', [1, 2]) in b'\x01\x02\x03')
 # CPython gives False here
diff --git a/tests/basics/bytes_construct_array.py b/tests/basics/bytes_construct_array.py
index 453eb59010..7bdd8f10df 100644
--- a/tests/basics/bytes_construct_array.py
+++ b/tests/basics/bytes_construct_array.py
@@ -1,9 +1,12 @@
 # test construction of bytes from different objects
 try:
-    from array import array
+    from uarray import array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 # arrays
 print(bytes(array('b', [1, 2])))
diff --git a/tests/basics/bytes_construct_endian.py b/tests/basics/bytes_construct_endian.py
index cf1a9f408f..294c5f23f5 100644
--- a/tests/basics/bytes_construct_endian.py
+++ b/tests/basics/bytes_construct_endian.py
@@ -1,10 +1,13 @@
 # test construction of bytes from different objects
 
 try:
-    from array import array
+    from uarray import array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 # arrays
 print(bytes(array('h', [1, 2])))
diff --git a/tests/basics/memoryview1.py b/tests/basics/memoryview1.py
index a0ac9e3449..b5314f3e99 100644
--- a/tests/basics/memoryview1.py
+++ b/tests/basics/memoryview1.py
@@ -4,6 +4,14 @@ try:
 except:
     print("SKIP")
     raise SystemExit
+try:
+    import uarray as array
+except ImportError:
+    try:
+        import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 # test reading from bytes
 b = b'1234'
@@ -39,7 +47,6 @@ m = memoryview(bytearray(2))
 print(bytearray(m))
 print(list(memoryview(memoryview(b'1234')))) # read-only memoryview
 
-import array
 a = array.array('i', [1, 2, 3, 4])
 m = memoryview(a)
 print(list(m))
diff --git a/tests/basics/memoryview2.py b/tests/basics/memoryview2.py
index 06a7be59fd..eacc227c28 100644
--- a/tests/basics/memoryview2.py
+++ b/tests/basics/memoryview2.py
@@ -1,10 +1,17 @@
 # test memoryview accessing maximum values for signed/unsigned elements
 try:
-    from array import array
     memoryview
 except:
     print("SKIP")
     raise SystemExit
+try:
+    from uarray import array
+except ImportError:
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 print(list(memoryview(b'\x7f\x80\x81\xff')))
 print(list(memoryview(array('b', [0x7f, -0x80]))))
diff --git a/tests/basics/memoryview_intbig.py b/tests/basics/memoryview_intbig.py
index a76d9cbec7..4800a70cc2 100644
--- a/tests/basics/memoryview_intbig.py
+++ b/tests/basics/memoryview_intbig.py
@@ -1,10 +1,17 @@
 # test memoryview accessing maximum values for signed/unsigned elements
 try:
-    from array import array
     memoryview
 except:
     print("SKIP")
     raise SystemExit
+try:
+    from uarray import array
+except ImportError:
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 print(list(memoryview(array('i', [0x7f000000, -0x80000000]))))
 print(list(memoryview(array('I', [0x7f000000, 0x80000000, 0x81000000, 0xffffffff]))))
diff --git a/tests/basics/memoryview_itemsize.py b/tests/basics/memoryview_itemsize.py
index 60cb823087..cd7a87c23d 100644
--- a/tests/basics/memoryview_itemsize.py
+++ b/tests/basics/memoryview_itemsize.py
@@ -1,9 +1,16 @@
 try:
     memoryview(b'a').itemsize
-    from array import array
 except:
     print("SKIP")
     raise SystemExit
+try:
+    from uarray import array
+except ImportError:
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 for code in ['b', 'h', 'i', 'l', 'q', 'f', 'd']:
     print(memoryview(array(code)).itemsize)
diff --git a/tests/float/array_construct.py b/tests/float/array_construct.py
index 938675835b..eb735c67c3 100644
--- a/tests/float/array_construct.py
+++ b/tests/float/array_construct.py
@@ -1,10 +1,13 @@
 # test construction of array from array with float type
 
 try:
-    from array import array
+    from uarray import array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 print(array('f', array('h', [1, 2])))
 print(array('d', array('f', [1, 2])))
diff --git a/tests/float/bytearray_construct.py b/tests/float/bytearray_construct.py
index e960d624ec..4e7631b2b9 100644
--- a/tests/float/bytearray_construct.py
+++ b/tests/float/bytearray_construct.py
@@ -1,9 +1,12 @@
 # test construction of bytearray from array with float type
 
 try:
-    from array import array
+    from uarray import array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 print(bytearray(array('f', [1, 2.3])))
diff --git a/tests/float/bytes_construct.py b/tests/float/bytes_construct.py
index 0e4482e436..96294659bf 100644
--- a/tests/float/bytes_construct.py
+++ b/tests/float/bytes_construct.py
@@ -1,9 +1,12 @@
 # test construction of bytearray from array with float type
 
 try:
-    from array import array
+    from uarray import array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 print(bytes(array('f', [1, 2.3])))
diff --git a/tests/float/float_array.py b/tests/float/float_array.py
index 8c8edcff7c..0c7f1b3ade 100644
--- a/tests/float/float_array.py
+++ b/tests/float/float_array.py
@@ -1,8 +1,11 @@
 try:
-    from array import array
+    from uarray import array
 except ImportError:
-    print("SKIP")
-    raise SystemExit
+    try:
+        from array import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 def test(a):
     print(a)
diff --git a/tests/inlineasm/asmfpldrstr.py b/tests/inlineasm/asmfpldrstr.py
index 8fa9af6369..0efb50bb0e 100644
--- a/tests/inlineasm/asmfpldrstr.py
+++ b/tests/inlineasm/asmfpldrstr.py
@@ -1,4 +1,4 @@
-import array
+import uarray as array
 @micropython.asm_thumb      # test vldr, vstr
 def arrayadd(r0):
     vldr(s0, [r0, 0])
diff --git a/tests/inlineasm/asmsum.py b/tests/inlineasm/asmsum.py
index 9cbd8418ea..93d8eec8dc 100644
--- a/tests/inlineasm/asmsum.py
+++ b/tests/inlineasm/asmsum.py
@@ -46,7 +46,7 @@ def asm_sum_bytes(r0, r1):
 
     mov(r0, r2)
 
-import array
+import uarray as array
 
 b = array.array('l', (100, 200, 300, 400))
 n = asm_sum_words(len(b), b)
diff --git a/tests/micropython/heapalloc_iter.py b/tests/micropython/heapalloc_iter.py
index 163e172111..5a44a558bb 100644
--- a/tests/micropython/heapalloc_iter.py
+++ b/tests/micropython/heapalloc_iter.py
@@ -1,10 +1,17 @@
 # test that iterating doesn't use the heap
 try:
     frozenset
-    import array
-except (NameError, ImportError):
+except NameError:
     print("SKIP")
     raise SystemExit
+try:
+    import uarray as array
+except ImportError:
+    try:
+        import array
+    except ImportError:
+        print("SKIP")
+        raise SystemExit
 
 try:
     from micropython import heap_lock, heap_unlock
diff --git a/tests/misc/non_compliant.py b/tests/misc/non_compliant.py
index 580583bf39..ea67382227 100644
--- a/tests/misc/non_compliant.py
+++ b/tests/misc/non_compliant.py
@@ -1,7 +1,7 @@
 # tests for things that are not implemented, or have non-compliant behaviour
 
 try:
-    import array
+    import uarray as array
     import ustruct
 except ImportError:
     print("SKIP")