fix more tests; get some tests from v1.23 or later

Author: dhalbert

py/nativeglue.h

@@ -157,6 +157,7 @@ typedef struct _mp_fun_table_t {
     double (*obj_get_float_to_d)(mp_obj_t o);
     bool (*get_buffer)(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags);
     const mp_stream_p_t *(*get_stream_raise)(mp_obj_t self_in, int flags);
+    // CIRCUITPY-CHANGE
     void (*assert_native_inited)(mp_obj_t native_object);
     const mp_print_t *plat_print;
     const mp_obj_type_t *type_type;

tests/basics/async_await2.py

@@ -1,6 +1,6 @@
 # test await expression
 
-# CIRCUITPY-CHNAGE
+# CIRCUITPY-CHANGE
 # uPy allows normal generators to be awaitables.
 # CircuitPython does not.
 # In CircuitPython you need to have an __await__ method on an awaitable like in CPython;

tests/basics/builtin_pow3.py

@@ -29,6 +29,7 @@
 except TypeError:
     print("TypeError expected")
 
+# CIRCUITPY-CHANGE
 try:
     print(pow(4, 5, 0))
 except ValueError:

tests/basics/bytes.py

@@ -2,7 +2,6 @@
 print(b'123')
 print(br'123')
 print(rb'123')
-print(b'\u1234')
 
 # construction
 print(bytes())

tests/basics/bytes_escape_unicode.py

@@ -0,0 +1,3 @@
+# Coverage test for unicode escape in a bytes literal.
+# CPython issues a SyntaxWarning for this.
+print(b"\u1234")

tests/basics/bytes_escape_unicode.py.exp

@@ -0,0 +1 @@
+b'\\u1234'

tests/basics/gen_yield_from_throw.py

@@ -17,24 +17,6 @@ def gen2():
 except TypeError:
     print("got TypeError from downstream!")
 
-# passing None as second argument to throw
-g = gen2()
-print(next(g))
-print(g.throw(ValueError, None))
-try:
-    print(next(g))
-except TypeError:
-    print("got TypeError from downstream!")
-
-# passing an exception instance as second argument to throw
-g = gen2()
-print(next(g))
-print(g.throw(ValueError, ValueError(123)))
-try:
-    print(next(g))
-except TypeError:
-    print("got TypeError from downstream!")
-
 # thrown value is caught and then generator returns normally
 def gen():
     try:

tests/basics/gen_yield_from_throw_multi_arg.py

@@ -0,0 +1,34 @@
+# Test generator .throw() with multiple arguments.
+# Using multiple arguments is deprecated since CPython 3.12.
+
+
+def gen():
+    try:
+        yield 1
+    except ValueError as e:
+        print("got ValueError from upstream!", repr(e.args))
+    yield "str1"
+    raise TypeError
+
+
+def gen2():
+    print((yield from gen()))
+
+
+# Passing None as second argument to throw.
+g = gen2()
+print(next(g))
+print(g.throw(ValueError, None))
+try:
+    print(next(g))
+except TypeError:
+    print("got TypeError from downstream!")
+
+# Passing an exception instance as second argument to throw.
+g = gen2()
+print(next(g))
+print(g.throw(ValueError, ValueError(123)))
+try:
+    print(next(g))
+except TypeError:
+    print("got TypeError from downstream!")

tests/basics/gen_yield_from_throw_multi_arg.py.exp

@@ -0,0 +1,8 @@
+1
+got ValueError from upstream! ()
+str1
+got TypeError from downstream!
+1
+got ValueError from upstream! (123,)
+str1
+got TypeError from downstream!

tests/basics/gen_yield_from_throw_repeat.py

@@ -0,0 +1,22 @@
+# Test throwing repeatedly into the same generator, where that generator
+# is yielding from another generator.
+
+
+def yielder():
+    yield 4
+    yield 5
+
+
+def gen():
+    while True:
+        try:
+            print("gen received:", (yield from yielder()))
+        except ValueError as exc:
+            print(repr(exc))
+
+
+g = gen()
+for i in range(2):
+    print("send, got:", g.send(None))
+    print("throw, got:", g.throw(ValueError("a", i)))
+    print("throw, got:", g.throw(ValueError("b", i)))