pre-commit fixes

This commit is contained in:
Dan Halbert 2023-10-23 20:14:40 -04:00
parent 1cd0ec225f
commit 8f254035dd
10 changed files with 9 additions and 9 deletions

View File

@ -73,7 +73,7 @@ STATIC void uni_print_quoted(const mp_print_t *print, const byte *str_data, uint
mp_print_str(print, "\\r"); mp_print_str(print, "\\r");
} else if (ch == '\t') { } else if (ch == '\t') {
mp_print_str(print, "\\t"); mp_print_str(print, "\\t");
// CIRCUITPY-CHANGE: print printable Unicode chars // CIRCUITPY-CHANGE: print printable Unicode chars
} else if (ch <= 0x1f || (0x7f <= ch && ch <= 0xa0) || ch == 0xad) { } else if (ch <= 0x1f || (0x7f <= ch && ch <= 0xa0) || ch == 0xad) {
mp_printf(print, "\\x%02x", ch); mp_printf(print, "\\x%02x", ch);
} else if ((0x2000 <= ch && ch <= 0x200f) || ch == 0x2028 || ch == 0x2029) { } else if ((0x2000 <= ch && ch <= 0x200f) || ch == 0x2028 || ch == 0x2029) {

View File

@ -1297,7 +1297,7 @@ void mp_store_attr(mp_obj_t base, qstr attr, mp_obj_t value) {
// success // success
return; return;
} }
// CIRCUITPY-CHANGE: https://github.com/adafruit/circuitpython/pull/50 // CIRCUITPY-CHANGE: https://github.com/adafruit/circuitpython/pull/50
#if MICROPY_PY_BUILTINS_PROPERTY #if MICROPY_PY_BUILTINS_PROPERTY
} else if (MP_OBJ_TYPE_HAS_SLOT(type, locals_dict)) { } else if (MP_OBJ_TYPE_HAS_SLOT(type, locals_dict)) {
// generic method lookup // generic method lookup

View File

@ -25,4 +25,3 @@ $(BUILD)/memzip-files.c: $(shell find ${MEMZIP_DIR} -type f)
@$(ECHO) "Creating $@" @$(ECHO) "Creating $@"
$(Q)$(PYTHON) $(MAKE_MEMZIP) --zip-file $(BUILD)/memzip-files.zip --c-file $@ $(MEMZIP_DIR) $(Q)$(PYTHON) $(MAKE_MEMZIP) --zip-file $(BUILD)/memzip-files.zip --c-file $@ $(MEMZIP_DIR)
``` ```

View File

@ -16,4 +16,3 @@ mp_lexer_t *mp_lexer_new_from_file(const char *filename)
return mp_lexer_new_from_str_len(qstr_from_str(filename), (const char *)data, (mp_uint_t)len, 0); return mp_lexer_new_from_str_len(qstr_from_str(filename), (const char *)data, (mp_uint_t)len, 0);
} }

View File

@ -4,6 +4,7 @@ except ImportError:
print("SKIP") print("SKIP")
raise SystemExit raise SystemExit
# CIRCUITPY-CHANGE: CircuitPython provides __await__() # CIRCUITPY-CHANGE: CircuitPython provides __await__()
async def foo(): async def foo():
return 42 return 42

View File

@ -1,2 +1,2 @@
# micropython is always builtin and cannot be overriden by the filesystem. # micropython is always builtin and cannot be overridden by the filesystem.
print("ERROR: micropython from filesystem") print("ERROR: micropython from filesystem")

View File

@ -1,2 +1,2 @@
# sys is always builtin and cannot be overriden by the filesystem. # sys is always builtin and cannot be overridden by the filesystem.
print("ERROR: sys from filesystem") print("ERROR: sys from filesystem")

View File

@ -1,3 +1,3 @@
# usys (and any u-prefix) is always builtin and cannot be overriden by the # usys (and any u-prefix) is always builtin and cannot be overridden by the
# filesystem. # filesystem.
print("ERROR: usys from filesystem") print("ERROR: usys from filesystem")

View File

@ -20,7 +20,8 @@ TEST_MAPPINGS = {
"heapq": "heapq/heapq_$(ARCH).mpy", "heapq": "heapq/heapq_$(ARCH).mpy",
"random": "random/random_$(ARCH).mpy", "random": "random/random_$(ARCH).mpy",
"re": "re/re_$(ARCH).mpy", "re": "re/re_$(ARCH).mpy",
"zlib": "zlib/zlib_$(ARCH).mpy",} "zlib": "zlib/zlib_$(ARCH).mpy",
}
# Code to allow a target MicroPython to import an .mpy from RAM # Code to allow a target MicroPython to import an .mpy from RAM
injected_import_hook_code = """\ injected_import_hook_code = """\

View File

@ -42,7 +42,7 @@ ports_to_delete = [
] ]
for p in ports_to_delete: for p in ports_to_delete:
try: try:
git.rm("-rf", "ports/" + p)XC git.rm("-rf", "ports/" + p)
except sh.ErrorReturnCode_128: except sh.ErrorReturnCode_128:
pass pass