fix precommit complaints

Author: dhalbert

lib/littlefs/lfs2.c

@@ -643,7 +643,7 @@ static int lfs2_alloc_scan(lfs2_t *lfs2) {
     //
     // note we limit the lookahead buffer to at most the amount of blocks
     // checkpointed, this prevents the math in lfs2_alloc from underflowing
-    lfs2->lookahead.start = (lfs2->lookahead.start + lfs2->lookahead.next) 
+    lfs2->lookahead.start = (lfs2->lookahead.start + lfs2->lookahead.next)
             % lfs2->block_count;
     lfs2->lookahead.next = 0;
     lfs2->lookahead.size = lfs2_min(
@@ -5257,7 +5257,7 @@ static int lfs2_fs_grow_(lfs2_t *lfs2, lfs2_size_t block_count) {
         return 0;
     }
 
-    
+
 #ifndef LFS2_SHRINKNONRELOCATING
     // shrinking is not supported
     LFS2_ASSERT(block_count >= lfs2->block_count);

locale/circuitpython.pot

@@ -78,6 +78,11 @@ msgid ""
 "%d address pins, %d rgb pins and %d tiles indicate a height of %d, not %d"
 msgstr ""
 
+#: py/emitinlinextensa.c
+#, c-format
+msgid "%d is not a multiple of %d"
+msgstr ""
+
 #: shared-bindings/microcontroller/Pin.c
 msgid "%q and %q contain duplicate pins"
 msgstr ""
@@ -259,10 +264,6 @@ msgstr ""
 msgid "%q out of range"
 msgstr ""
 
-#: py/objmodule.c
-msgid "%q renamed %q"
-msgstr ""
-
 #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
 msgid "%q step cannot be zero"
 msgstr ""
@@ -956,6 +957,14 @@ msgstr ""
 msgid "ECB only operates on 16 bytes at a time"
 msgstr ""
 
+#: py/asmxtensa.c
+msgid "ERROR: %q %q not word-aligned"
+msgstr ""
+
+#: py/asmxtensa.c
+msgid "ERROR: xtensa %q out of range"
+msgstr ""
+
 #: ports/espressif/common-hal/busio/SPI.c
 #: ports/espressif/common-hal/canio/CAN.c
 msgid "ESP-IDF memory allocation failed"
@@ -1020,10 +1029,6 @@ msgstr ""
 msgid "Failed to buffer the sample"
 msgstr ""
 
-#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
-msgid "Failed to connect"
-msgstr ""
-
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nordic/common-hal/_bleio/Adapter.c
 #: ports/zephyr-cp/common-hal/_bleio/Adapter.c
@@ -2615,10 +2620,6 @@ msgstr ""
 msgid "array/bytes required on right side"
 msgstr ""
 
-#: py/asmxtensa.c
-msgid "asm overflow"
-msgstr ""
-
 #: py/compile.c
 msgid "async for/with outside async function"
 msgstr ""
@@ -2832,6 +2833,10 @@ msgstr ""
 msgid "can't create '%q' instances"
 msgstr ""
 
+#: py/objtype.c
+msgid "can't create instance"
+msgstr ""
+
 #: py/compile.c
 msgid "can't declare nonlocal in outer code"
 msgstr ""
@@ -2930,14 +2935,14 @@ msgstr ""
 msgid "cannot convert complex type"
 msgstr ""
 
-#: py/objtype.c
-msgid "cannot create instance"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c
 msgid "cannot delete array elements"
 msgstr ""
 
+#: py/compile.c
+msgid "cannot emit native code for this architecture"
+msgstr ""
+
 #: extmod/ulab/code/ndarray.c
 msgid "cannot reshape array"
 msgstr ""
@@ -3092,7 +3097,7 @@ msgstr ""
 msgid "div/mod not implemented for uint"
 msgstr ""
 
-#: extmod/ulab/code/numpy/create.c
+#: extmod/ulab/code/numpy/create.c py/objint_longlong.c py/objint_mpz.c
 msgid "divide by zero"
 msgstr ""
 
@@ -3476,6 +3481,10 @@ msgstr ""
 msgid "interval must be in range %s-%s"
 msgstr ""
 
+#: py/emitinlinerv32.c
+msgid "invalid RV32 instruction '%q'"
+msgstr ""
+
 #: py/compile.c
 msgid "invalid arch"
 msgstr ""
@@ -3670,6 +3679,10 @@ msgstr ""
 msgid "mode must be complete, or reduced"
 msgstr ""
 
+#: py/runtime.c
+msgid "module '%q' has no attribute '%q'"
+msgstr ""
+
 #: py/builtinimport.c
 msgid "module not found"
 msgstr ""
@@ -3718,10 +3731,6 @@ msgstr ""
 msgid "native code in .mpy unsupported"
 msgstr ""
 
-#: py/asmthumb.c
-msgid "native method too big"
-msgstr ""
-
 #: py/emitnative.c
 msgid "native yield"
 msgstr ""
@@ -3743,7 +3752,7 @@ msgstr ""
 msgid "negative power with no float support"
 msgstr ""
 
-#: py/objint_mpz.c py/runtime.c
+#: py/objint_longlong.c py/objint_mpz.c py/runtime.c
 msgid "negative shift count"
 msgstr ""
 
@@ -4102,6 +4111,10 @@ msgstr ""
 msgid "real and imaginary parts must be of equal length"
 msgstr ""
 
+#: extmod/modre.c
+msgid "regex too complex"
+msgstr ""
+
 #: py/builtinimport.c
 msgid "relative import"
 msgstr ""
@@ -4111,6 +4124,10 @@ msgstr ""
 msgid "requested length %d but object has length %d"
 msgstr ""
 
+#: py/objint_longlong.c py/parsenum.c
+msgid "result overflows long long storage"
+msgstr ""
+
 #: extmod/ulab/code/ndarray_operators.c
 msgid "results cannot be cast to specified type"
 msgstr ""
@@ -4375,10 +4392,6 @@ msgstr ""
 msgid "type takes 1 or 3 arguments"
 msgstr ""
 
-#: py/objint_longlong.c
-msgid "ulonglong too large"
-msgstr ""
-
 #: py/parse.c
 msgid "unexpected indent"
 msgstr ""
@@ -4400,10 +4413,6 @@ msgstr ""
 msgid "unindent doesn't match any outer indent level"
 msgstr ""
 
-#: py/emitinlinerv32.c
-msgid "unknown RV32 instruction '%q'"
-msgstr ""
-
 #: py/objstr.c
 #, c-format
 msgid "unknown conversion specifier %c"

ports/espressif/tools/update_sdkconfig.py

@@ -157,7 +157,7 @@ def sym_default(sym):
     default=False,
     help="Updates the sdkconfigs outside of the board directory.",
 )
-def update(debug, board, update_all):  # noqa: C901: too complex
+def update(debug, board, update_all):  # noqa: C901 too complex
     """Updates related sdkconfig files based on the build directory version that
     was likely modified by menuconfig."""
 

py/binary.c

@@ -438,7 +438,7 @@ void mp_binary_set_val(char struct_type, char val_type, mp_obj_t val_in, byte *p
             val = fp_sp.i;
             break;
         }
-        // CIRCUITPY-CHANGE
+            // CIRCUITPY-CHANGE
         #if MICROPY_PY_DOUBLE_TYPECODE
         case 'd': {
             union {

py/makeversionhdr.py

@@ -27,25 +27,6 @@ def cannot_determine_version():
     make fetch-tags"""
     )
 
-    with open(os.path.join(repo_path, "py", "mpconfig.h")) as f:
-        for line in f:
-            if line.startswith("#define MICROPY_VERSION_MAJOR "):
-                ver_major = int(line.strip().split()[2])
-            elif line.startswith("#define MICROPY_VERSION_MINOR "):
-                ver_minor = int(line.strip().split()[2])
-            elif line.startswith("#define MICROPY_VERSION_MICRO "):
-                ver_micro = int(line.strip().split()[2])
-            elif line.startswith("#define MICROPY_VERSION_PRERELEASE "):
-                ver_prerelease = int(line.strip().split()[2])
-                git_tag = "v%d.%d.%d%s" % (
-                    ver_major,
-                    ver_minor,
-                    ver_micro,
-                    "-preview" if ver_prerelease else "",
-                )
-                return git_tag
-    return None
-
 
 def make_version_header(repo_path, filename):
     # Get version info using git (required)

py/malloc.c

@@ -145,8 +145,8 @@ void *m_malloc_with_finaliser(size_t num_bytes) {
 void *m_malloc0(size_t num_bytes) {
     // CIRCUITPY-CHANGE: use helper
     return m_malloc_helper(num_bytes,
-     (MICROPY_GC_CONSERVATIVE_CLEAR ? 0 : M_MALLOC_ENSURE_ZEROED)
-     | M_MALLOC_RAISE_ERROR | M_MALLOC_COLLECT);
+        (MICROPY_GC_CONSERVATIVE_CLEAR ? 0 : M_MALLOC_ENSURE_ZEROED)
+        | M_MALLOC_RAISE_ERROR | M_MALLOC_COLLECT);
 }
 
 // CIRCUITPY-CHANGE: add selective collect

py/mpprint.c

@@ -599,11 +599,11 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) {
                 }
                 // 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);   
-                   #else
-                   chrs += mp_print_strn(print, "0x", 2, flags, fill, width);
-                   #endif
+                    #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);
+                    #else
+                    chrs += mp_print_strn(print, "0x", 2, flags, fill, width);
+                    #endif
                 }
                 chrs += mp_print_int(print, val, fmt_chr == 'd', base, fmt_c, flags, fill, width);
                 break;

py/objint_longlong.c

@@ -45,6 +45,7 @@ const mp_obj_int_t mp_sys_maxsize_obj = {{&mp_type_int}, MP_SSIZE_MAX};
 
 static void raise_long_long_overflow(void) {
     mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("result overflows long long storage"));
+}
 
 // CIRCUITPY-CHANGE: bit_length
 mp_obj_t mp_obj_int_bit_length_impl(mp_obj_t self_in) {
@@ -335,8 +336,33 @@ mp_int_t mp_obj_int_get_truncated(mp_const_obj_t self_in) {
 }
 
 mp_int_t mp_obj_int_get_checked(mp_const_obj_t self_in) {
-    // TODO: Check overflow
-    return mp_obj_int_get_truncated(self_in);
+    if (mp_obj_is_small_int(self_in)) {
+        return MP_OBJ_SMALL_INT_VALUE(self_in);
+    } else {
+        const mp_obj_int_t *self = self_in;
+        long long value = self->val;
+        mp_int_t truncated = (mp_int_t)value;
+        if ((long long)truncated == value) {
+            return truncated;
+        }
+    }
+    mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("overflow converting long int to machine word"));
+}
+
+mp_uint_t mp_obj_int_get_uint_checked(mp_const_obj_t self_in) {
+    if (mp_obj_is_small_int(self_in)) {
+        if (MP_OBJ_SMALL_INT_VALUE(self_in) >= 0) {
+            return MP_OBJ_SMALL_INT_VALUE(self_in);
+        }
+    } else {
+        const mp_obj_int_t *self = self_in;
+        long long value = self->val;
+        mp_uint_t truncated = (mp_uint_t)value;
+        if (value >= 0 && (long long)truncated == value) {
+            return truncated;
+        }
+    }
+    mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("overflow converting long int to machine word"));
 }
 
 #if MICROPY_PY_BUILTINS_FLOAT

py/objlist.c

@@ -173,8 +173,8 @@ static mp_obj_t list_binary_op(mp_binary_op_t op, mp_obj_t lhs, mp_obj_t rhs) {
 static mp_obj_t list_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
     #if MICROPY_PY_BUILTINS_SLICE
     if (mp_obj_is_type(index, &mp_type_slice)) {
-    // CIRCUITPY-CHANGE: handle subclassing
-    mp_obj_list_t *self = native_list(self_in);
+        // CIRCUITPY-CHANGE: handle subclassing
+        mp_obj_list_t *self = native_list(self_in);
         mp_bound_slice_t slice;
         bool fast = mp_seq_get_fast_slice_indexes(self->len, index, &slice);
         if (value == MP_OBJ_SENTINEL) {

py/sequence.c

@@ -40,7 +40,7 @@ size_t mp_seq_multiply_len(size_t item_sz, size_t len) {
     if (mp_mul_mp_int_t_overflow(item_sz, len, &new_len)) {
         mp_raise_msg(&mp_type_OverflowError, MP_ERROR_TEXT("small int overflow"));
     }
-    return (size_t) new_len;
+    return (size_t)new_len;
 }
 
 // Implements backend of sequence * integer operation. Assumes elements are