tests: Rename uasyncio to asyncio.

This work was funded through GitHub Sponsors.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>

tests/extmod/asyncio_await_return.py

@@ -1,13 +1,10 @@
 # Test that tasks return their value correctly to the caller
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def foo():

tests/extmod/asyncio_basic.py

@@ -1,11 +1,8 @@
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 import time
 

tests/extmod/asyncio_basic2.py

@@ -1,11 +1,8 @@
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def forever():

tests/extmod/asyncio_cancel_fair.py

@@ -2,13 +2,10 @@
 # That tasks which continuously cancel each other don't take over the scheduler
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(id, other):

tests/extmod/asyncio_cancel_fair2.py

@@ -2,13 +2,10 @@
 # That tasks which keeps being cancelled by multiple other tasks gets a chance to run
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task_a():

tests/extmod/asyncio_cancel_self.py

@@ -1,13 +1,10 @@
 # Test a task cancelling itself (currently unsupported)
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task():

tests/extmod/asyncio_cancel_task.py

@@ -1,13 +1,10 @@
 # Test cancelling a task
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(s, allow_cancel):

tests/extmod/asyncio_cancel_wait_on_finished.py

@@ -1,13 +1,10 @@
 # Test cancelling a task that is waiting on a task that just finishes.
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def sleep_task():

tests/extmod/asyncio_current_task.py

@@ -1,13 +1,10 @@
 # Test current_task() function
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(result):

tests/extmod/asyncio_event.py

@@ -1,13 +1,10 @@
 # Test Event class
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(id, ev):

tests/extmod/asyncio_event_fair.py

@@ -2,13 +2,10 @@
 # That tasks which continuously wait on events don't take over the scheduler
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task1(id):

tests/extmod/asyncio_exception.py

@@ -1,13 +1,10 @@
 # Test general exception handling
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 # main task raising an exception

tests/extmod/asyncio_fair.py

@@ -1,13 +1,10 @@
 # Test fairness of scheduler
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(id, t):

tests/extmod/asyncio_gather.py

@@ -1,13 +1,10 @@
-# test uasyncio.gather() function
+# test asyncio.gather() function
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def factorial(name, number):

tests/extmod/asyncio_gather_notimpl.py

@@ -1,13 +1,10 @@
-# Test uasyncio.gather() function, features that are not implemented.
+# Test asyncio.gather() function, features that are not implemented.
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 def custom_handler(loop, context):

tests/extmod/asyncio_get_event_loop.py

@@ -1,13 +1,10 @@
 # Test get_event_loop()
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def main():

tests/extmod/asyncio_heaplock.py

@@ -1,6 +1,6 @@
 # test that the following do not use the heap:
 # - basic scheduling of tasks
-# - uasyncio.sleep_ms
+# - asyncio.sleep_ms
 # - StreamWriter.write, stream is blocked and data to write is a bytes object
 # - StreamWriter.write, when stream is not blocked
 
@@ -25,13 +25,10 @@ except RuntimeError:
     raise SystemExit
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 class TestStream:

tests/extmod/asyncio_lock.py

@@ -1,13 +1,10 @@
 # Test Lock class
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task_loop(id, lock):

tests/extmod/asyncio_lock_cancel.py

@@ -1,13 +1,10 @@
 # Test that locks work when cancelling multiple waiters on the lock
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(i, lock, lock_flag):

tests/extmod/asyncio_loop_stop.py

@@ -1,13 +1,10 @@
 # Test Loop.stop() to stop the event loop
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task():

tests/extmod/asyncio_micropython.py

@@ -3,7 +3,7 @@
 # - wait_for_ms
 
 try:
-    import time, uasyncio
+    import time, asyncio
 except ImportError:
     print("SKIP")
     raise SystemExit
@@ -11,7 +11,7 @@ except ImportError:
 
 async def task(id, t):
     print("task start", id)
-    await uasyncio.sleep_ms(t)
+    await asyncio.sleep_ms(t)
     print("task end", id)
     return id * 2
 
@@ -19,25 +19,25 @@ async def task(id, t):
 async def main():
     # Simple sleep_ms
     t0 = time.ticks_ms()
-    await uasyncio.sleep_ms(1)
+    await asyncio.sleep_ms(1)
     print(time.ticks_diff(time.ticks_ms(), t0) < 100)
 
     try:
         # Sleep 1ms beyond maximum allowed sleep value
-        await uasyncio.sleep_ms(time.ticks_add(0, -1) // 2 + 1)
+        await asyncio.sleep_ms(time.ticks_add(0, -1) // 2 + 1)
     except OverflowError:
         print("OverflowError")
 
     # When task finished before the timeout
-    print(await uasyncio.wait_for_ms(task(1, 5), 50))
+    print(await asyncio.wait_for_ms(task(1, 5), 50))
 
     # When timeout passes and task is cancelled
     try:
-        print(await uasyncio.wait_for_ms(task(2, 50), 5))
-    except uasyncio.TimeoutError:
+        print(await asyncio.wait_for_ms(task(2, 50), 5))
+    except asyncio.TimeoutError:
         print("timeout")
 
     print("finish")
 
 
-uasyncio.run(main())
+asyncio.run(main())

tests/extmod/asyncio_new_event_loop.py

@@ -1,13 +1,10 @@
 # Test Loop.new_event_loop()
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task():

tests/extmod/asyncio_set_exception_handler.py

@@ -1,13 +1,10 @@
 # Test that tasks return their value correctly to the caller
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 def custom_handler(loop, context):

tests/extmod/asyncio_task_done.py

@@ -1,13 +1,10 @@
 # Test the Task.done() method
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(t, exc=None):

tests/extmod/asyncio_threadsafeflag.py

@@ -1,7 +1,7 @@
 # Test Event class
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
     print("SKIP")
     raise SystemExit

tests/extmod/asyncio_wait_for.py

@@ -1,13 +1,10 @@
 # Test asyncio.wait_for
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def task(id, t):

tests/extmod/asyncio_wait_for_fwd.py

@@ -1,13 +1,10 @@
 # Test asyncio.wait_for, with forwarding cancellation
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def awaiting(t, return_if_fail):

tests/extmod/asyncio_wait_task.py

@@ -1,13 +1,10 @@
 # Test waiting on a task
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 import time

tests/multi_espnow/80_asyncio_client.py

@@ -102,7 +102,7 @@ def instance0():
 # Client
 def instance1():
     try:
-        import uasyncio as asyncio
+        import asyncio
         from aioespnow import AIOESPNow
     except ImportError:
         print("SKIP")

tests/multi_espnow/81_asyncio_server.py

@@ -58,7 +58,7 @@ async def echo_server(e):
 # Server
 def instance0():
     try:
-        import uasyncio as asyncio
+        import asyncio
         from aioespnow import AIOESPNow
     except ImportError:
         print("SKIP")

tests/multi_net/asyncio_tcp_client_rst.py

@@ -1,13 +1,10 @@
 # Test TCP server with client issuing TCP RST part way through read
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 import struct, time, socket
 

tests/multi_net/asyncio_tcp_close_write.py

@@ -1,13 +1,10 @@
-# Test uasyncio TCP stream closing then writing
+# Test asyncio TCP stream closing then writing
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 PORT = 8000
 

tests/multi_net/asyncio_tcp_readall.py

@@ -1,13 +1,10 @@
-# Test uasyncio stream read(-1) method using TCP server/client
+# Test asyncio stream read(-1) method using TCP server/client
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 PORT = 8000
 

tests/multi_net/asyncio_tcp_readexactly.py

@@ -1,13 +1,10 @@
-# Test uasyncio stream readexactly() method using TCP server/client
+# Test asyncio stream readexactly() method using TCP server/client
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 PORT = 8000
 

tests/multi_net/asyncio_tcp_readinto.py

@@ -1,13 +1,10 @@
-# Test uasyncio stream readinto() method using TCP server/client
+# Test asyncio stream readinto() method using TCP server/client
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 try:
     import array

tests/multi_net/asyncio_tcp_server_client.py

@@ -1,13 +1,10 @@
-# Test uasyncio TCP server and client using start_server() and open_connection()
+# Test asyncio TCP server and client using start_server() and open_connection()
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 PORT = 8000
 

tests/net_hosted/asyncio_start_server.py

@@ -1,13 +1,10 @@
-# Test basic behaviour of uasyncio.start_server()
+# Test basic behaviour of asyncio.start_server()
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def test():

tests/net_inet/asyncio_cancel_stream.py

@@ -1,13 +1,10 @@
 # Test cancelling a task waiting on stream IO
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def get(reader):

tests/net_inet/asyncio_open_connection.py

@@ -1,13 +1,10 @@
-# Test simple HTTP request with uasyncio.open_connection()
+# Test simple HTTP request with asyncio.open_connection()
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def http_get(url):

tests/net_inet/asyncio_tcp_read_headers.py

@@ -1,13 +1,10 @@
-# Test uasyncio.open_connection() and stream readline()
+# Test asyncio.open_connection() and stream readline()
 
 try:
-    import uasyncio as asyncio
+    import asyncio
 except ImportError:
-    try:
-        import asyncio
-    except ImportError:
-        print("SKIP")
-        raise SystemExit
+    print("SKIP")
+    raise SystemExit
 
 
 async def http_get_headers(url):

tests/run-tests.py

@@ -624,10 +624,10 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         skip_tests.add("basics/sys_tracebacklimit.py")  # requires traceback info
         skip_tests.add("basics/try_finally_return2.py")  # requires raise_varargs
         skip_tests.add("basics/unboundlocal.py")  # requires checking for unbound local
-        skip_tests.add("extmod/uasyncio_event.py")  # unknown issue
-        skip_tests.add("extmod/uasyncio_lock.py")  # requires async with
-        skip_tests.add("extmod/uasyncio_micropython.py")  # unknown issue
-        skip_tests.add("extmod/uasyncio_wait_for.py")  # unknown issue
+        skip_tests.add("extmod/asyncio_event.py")  # unknown issue
+        skip_tests.add("extmod/asyncio_lock.py")  # requires async with
+        skip_tests.add("extmod/asyncio_micropython.py")  # unknown issue
+        skip_tests.add("extmod/asyncio_wait_for.py")  # unknown issue
         skip_tests.add("misc/features.py")  # requires raise_varargs
         skip_tests.add(
             "misc/print_exception.py"
@@ -672,7 +672,7 @@ def run_tests(pyb, tests, args, result_dir, num_threads=1):
         is_bytearray = test_name.startswith("bytearray") or test_name.endswith("_bytearray")
         is_set_type = test_name.startswith(("set_", "frozenset")) or test_name.endswith("_set")
         is_slice = test_name.find("slice") != -1 or test_name in misc_slice_tests
-        is_async = test_name.startswith(("async_", "uasyncio_"))
+        is_async = test_name.startswith(("async_", "asyncio_"))
         is_const = test_name.startswith("const")
         is_io_module = test_name.startswith("io_")
         is_fstring = test_name.startswith("string_fstring")

tests/unix/extra_coverage.py.exp

@@ -50,7 +50,7 @@ RuntimeError:
 ame__
 port 
 
-builtins        micropython     _thread         _uasyncio
+builtins        micropython     _asyncio        _thread
 array           binascii        btree           cexample
 cmath           collections     cppexample      cryptolib
 errno           example_package                 ffi