fix more tests

Author: dhalbert

py/mpprint.c

@@ -597,6 +597,7 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) {
                 } else {
                     base = 16;
                 }
+                // CIRCUITPY-CHANGE: include "0x" for 'p' and 'P'.
                 if (fmt_chr == 'p' || fmt_chr == 'P') {
                    #if SUPPORT_INT_BASE_PREFIX
                    chrs += mp_print_int(print, va_arg(args, unsigned long int), 0, 16, 'a', flags | PF_FLAG_SHOW_PREFIX, fill, width);   

py/objfun.c

@@ -184,7 +184,8 @@ static mp_obj_t fun_bc_make_new(const mp_obj_type_t *type, size_t n_args, size_t
 static void fun_bc_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_fun_bc_t *o = MP_OBJ_TO_PTR(o_in);
-    mp_printf(print, "<function %q at 0x%p>", mp_obj_fun_get_name(o_in), o);
+    // CIRCUITPY-CHANGE: %p already prints "0x", so don't include it explicitly.
+    mp_printf(print, "<function %q at %p>", mp_obj_fun_get_name(o_in), o);
 }
 #endif
 

tests/extmod/binascii_unhexlify.py

@@ -14,7 +14,7 @@
 
 # CIRCUITPY-CHANGE
 # Unicode strings can be decoded
-print(binascii.unhexlify("313233344142434461626364"))
+print(unhexlify("313233344142434461626364"))
 
 try:
     a = unhexlify(b"0")  # odd buffer length

tests/thread/disable_irq.py

@@ -1,8 +1,14 @@
 # Ensure that disabling IRQs creates mutual exclusion between threads
 # (also tests nesting of disable_irq across threads)
-import machine
-import time
-import _thread
+
+# CIRCUITPY-CHANGE: no machine
+try:
+    import machine
+    import time
+    import _thread
+except ImportError:
+    print("SKIP")
+    raise SystemExit
 
 if not hasattr(machine, "disable_irq"):
     print("SKIP")