wip: fix some tests

Author: dhalbert

docs/library/builtins.rst

@@ -88,7 +88,7 @@ Functions and types
 
    .. classmethod:: from_bytes(bytes, byteorder="big", *, signed=False)
 
-   .. method:: to_bytes(length, byteorder="big", *, signed=False)
+   .. method:: to_bytes(length=1, byteorder="big", *, signed=False)
 
 .. function:: isinstance()
 

py/binary.c

@@ -474,6 +474,8 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte *p
             bool signed_type = is_signed(val_type);
             #if MICROPY_LONGINT_IMPL != MICROPY_LONGINT_IMPL_NONE
             if (mp_obj_is_exact_type(val_in, &mp_type_int)) {
+                // It's a longint.
+                mp_obj_int_buffer_overflow_check(val_in, size, signed_type);
                 mp_obj_int_to_bytes_impl(val_in, struct_type == '>', size, p);
                 return;
             }

py/objint.c

@@ -308,7 +308,7 @@ char *mp_obj_int_formatted(char **buf, size_t *buf_size, size_t *fmt_size, mp_co
 void mp_obj_int_buffer_overflow_check(mp_obj_t self_in, size_t nbytes, bool is_signed) {
     if (is_signed) {
         // self must be < 2**(bits - 1)
-        mp_obj_t edge = mp_binary_op(MP_BINARY_OP_INPLACE_LSHIFT,
+        mp_obj_t edge = mp_binary_op(MP_BINARY_OP_LSHIFT,
             mp_obj_new_int(1),
             mp_obj_new_int(nbytes * 8 - 1));
 
@@ -323,7 +323,7 @@ void mp_obj_int_buffer_overflow_check(mp_obj_t self_in, size_t nbytes, bool is_s
         // self must be >= 0
         if (mp_obj_int_sign(self_in) >= 0) {
             // and < 2**(bits)
-            mp_obj_t edge = mp_binary_op(MP_BINARY_OP_INPLACE_LSHIFT,
+            mp_obj_t edge = mp_binary_op(MP_BINARY_OP_LSHIFT,
                 mp_obj_new_int(1),
                 mp_obj_new_int(nbytes * 8));
 
@@ -536,7 +536,7 @@ static MP_DEFINE_CONST_CLASSMETHOD_OBJ(int_from_bytes_obj, MP_ROM_PTR(&int_from_
 static mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum { ARG_length, ARG_byteorder, ARG_signed };
     static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_length,    MP_ARG_REQUIRED | MP_ARG_INT, {.u_int = 0} },
+        { MP_QSTR_length,    MP_ARG_INT, {.u_int = 1} },
         // CIRCUITPY-CHANGE: not required and given a default value.
         { MP_QSTR_byteorder, MP_ARG_OBJ, {.u_obj = MP_OBJ_NEW_QSTR(MP_QSTR_big)} },
         { MP_QSTR_signed,    MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
@@ -578,8 +578,7 @@ static mp_obj_t int_to_bytes(size_t n_args, const mp_obj_t *pos_args, mp_map_t *
 
     return mp_obj_new_bytes_from_vstr(&vstr);
 }
-// CIRCUITPY-CHANGE: only two required args.
-static MP_DEFINE_CONST_FUN_OBJ_KW(int_to_bytes_obj, 2, int_to_bytes);
+static MP_DEFINE_CONST_FUN_OBJ_KW(int_to_bytes_obj, 1, int_to_bytes);
 
 static const mp_rom_map_elem_t int_locals_dict_table[] = {
     // CIRCUITPY-CHANGE

tests/basics/int_bytes_intbig.py

@@ -2,6 +2,8 @@
 import skip_if
 skip_if.no_bigint()
 
+import sys
+
 # CIRCUITPY-CHANGE: signed support
 print((2**64).to_bytes(9, "little"))
 print((-2**64).to_bytes(9, "little", signed=True))

tests/basics/struct_microptyhon.py

@@ -4,7 +4,7 @@
 # mp_obj_new_exception_msg_varg (exception requires decompression at raise-time to format)
 # mp_obj_new_exception_msg (decompression can be deferred)
 
-# NameError uses mp_obj_new_exception_msg_varg for NameError("name '%q' is not defined")
+# NameError uses mp_obj_new_exception_msg_varg for NameError("name '%q' isn't defined")
 # `raise 0` uses mp_obj_new_exception_msg for TypeError("exceptions must derive from BaseException")
 
 # Tests that deferred decompression works both via print(e) and accessing the message directly via e.args.

tests/micropython/heapalloc_exc_compressed.py

@@ -1,6 +1,6 @@
-NameError name 'name' is not defined
+NameError name 'name' isn't defined
 TypeError exceptions must derive from BaseException
-name 'name' is not defined
+name 'name' isn't defined
 exceptions must derive from BaseException
 NameError
 TypeError

tests/micropython/heapalloc_exc_compressed.py.exp

@@ -1,4 +1,4 @@
-NameError name 'name' is not defined
+NameError name 'name' isn't defined
 TypeError exceptions must derive from BaseException
-name 'name' is not defined
+name 'name' isn't defined
 exceptions must derive from BaseException