change CIRCUITPY change markers to CIRCUITPY-CHANGE

Author: dhalbert

extmod/extmod.mk

@@ -1,7 +1,7 @@
 # This makefile fragment adds the source code files for the core extmod modules
 # and provides rules to build 3rd-party components for extmod modules.
 
-# CIRCUITPY has removed many extmod modules.
+# CIRCUITPY-CHANGE: many extmod modules removed
 SRC_EXTMOD_C += \
 	extmod/modasyncio.c \
 	extmod/modbinascii.c \

extmod/modasyncio.c

@@ -228,7 +228,7 @@ STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(task_cancel_obj, task_cancel);
 
-// CIRCUITPY provides __await__().
+// CIRCUITPY-CHANGE: CircuitPython provides __await__().
 STATIC mp_obj_t task_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf);
 
 STATIC mp_obj_t task_await(mp_obj_t self_in) {

extmod/modbinascii.c

@@ -127,7 +127,7 @@ STATIC mp_obj_t mod_binascii_b2a_base64(size_t n_args, const mp_obj_t *pos_args,
     mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
     mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
     uint8_t newline = args[ARG_newline].u_bool;
-    // CIRCUITPY
+    // CIRCUITPY-CHANGE
     check_not_unicode(pos_args[0]);
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(pos_args[0], &bufinfo, MP_BUFFER_READ);
@@ -182,7 +182,7 @@ STATIC mp_obj_t mod_binascii_b2a_base64(size_t n_args, const mp_obj_t *pos_args,
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_binascii_b2a_base64_obj, 1, mod_binascii_b2a_base64);
 
-// CIRCUITPY uses a self-contained implementation of CRC32,
+// CIRCUITPY-CHANGE: uses a self-contained implementation of CRC32,
 // instead of depending on uzlib, like MicroPython.
 
 /*
@@ -223,7 +223,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_binascii_b2a_base64_obj, 1, mod_binascii_b
 
 STATIC mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) {
     mp_buffer_info_t bufinfo;
-    // CIRCUITPY
+    // CIRCUITPY-CHANGE
     check_not_unicode(args[0]);
     mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
     uint32_t crc = (n_args > 1) ? mp_obj_get_int_truncated(args[1]) : 0;

extmod/modjson.c

@@ -130,7 +130,7 @@ typedef struct _json_stream_t {
     mp_obj_t stream_obj;
     mp_uint_t (*read)(mp_obj_t obj, void *buf, mp_uint_t size, int *errcode);
     int errcode;
-    // CIRCUITPY
+    // CIRCUITPY-CHANGE
     mp_obj_t python_readinto[2 + 1];
     mp_obj_array_t bytearray_obj;
     size_t start;
@@ -154,7 +154,7 @@ STATIC byte json_stream_next(json_stream_t *s) {
     return s->cur;
 }
 
-// CIRCUITPY
+// CIRCUITPY-CHANGE
 
 // We read from an object's `readinto` method in chunks larger than the json
 // parser needs to reduce the number of function calls done.
@@ -398,7 +398,7 @@ STATIC mp_obj_t _mod_json_load(mp_obj_t stream_obj, bool return_first_json) {
         }
     }
 success:
-    // CIRCUITPY
+    // CIRCUITPY-CHANGE
 
     // It is legal for a stream to have contents after JSON.
     // E.g., A UART is not closed after receiving an object; in load() we will

extmod/modre.c

@@ -206,7 +206,7 @@ STATIC mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
     size_t len;
     subj.begin_line = subj.begin = mp_obj_str_get_data(args[1], &len);
     subj.end = subj.begin + len;
-    // CIRCUITPY
+    // CIRCUITPY-CHANGE
     #if MICROPY_PY_RE_MATCH_SPAN_START_END && !(defined(MICROPY_ENABLE_DYNRUNTIME) && MICROPY_ENABLE_DYNRUNTIME)
 
     if (n_args > 2) {

extmod/modselect.c

@@ -367,7 +367,7 @@ STATIC mp_uint_t poll_set_poll_until_ready_or_timeout(poll_set_t *poll_set, size
         if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_ticks >= timeout)) {
             return n_ready;
         }
-        // CIRCUITPY
+        // CIRCUITPY-CHANGE
         RUN_BACKGROUND_TASKS;
         if (mp_hal_is_interrupted()) {
             return 0;
@@ -425,7 +425,7 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
         if (!mp_map_slot_is_filled(&poll_set.map, i)) {
             continue;
         }
-        // CIRCUITPY
+        // CIRCUITPY-CHANGE
         RUN_BACKGROUND_TASKS;
 
         poll_obj_t *poll_obj = MP_OBJ_TO_PTR(poll_set.map.table[i].value);

extmod/vfs.c

@@ -365,7 +365,7 @@ mp_obj_t mp_vfs_getcwd(void) {
 }
 MP_DEFINE_CONST_FUN_OBJ_0(mp_vfs_getcwd_obj, mp_vfs_getcwd);
 
-// CIRCUITPY: accessible from shared-module/os/__init__.c
+// CIRCUITPY-CHANGE: accessible from shared-module/os/__init__.c
 mp_obj_t mp_vfs_ilistdir_it_iternext(mp_obj_t self_in) {
     mp_vfs_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
     if (self->is_iter) {

extmod/vfs_fat_file.c

@@ -257,7 +257,7 @@ STATIC mp_obj_t fat_vfs_open(mp_obj_t self_in, mp_obj_t path_in, mp_obj_t mode_i
         m_del_obj(pyb_file_obj_t, o);
         mp_raise_OSError_errno_str(fresult_to_errno_table[res], path_in);
     }
-    // CIRCUITPY does fast seek.
+    // CIRCUITPY-CHANGE: does fast seek.
     // If we're reading, turn on fast seek.
     if (mode == FA_READ) {
         // One call to determine how much space we need.

lib/re1.5/compilecode.c

@@ -254,7 +254,7 @@ int re1_5_compilecode(ByteProg *prog, const char *re)
     return 0;
 }
 
-// CIRCUITPY debug as main program
+// CIRCUITPY-CHANGE: debug as main program
 #if defined(DEBUG_COMPILECODE)
 #include <assert.h>
 void re1_5_fatal(char *x) {

ports/unix/Makefile

@@ -262,13 +262,13 @@ include $(TOP)/py/mkrules.mk
 
 .PHONY: test test_full
 
-# CIRCUITPY: these two targets are ours
+# CIRCUITPY-CHANGE: these two targets are for CircuitPython builds
 .PHONY: print-failures clean-failures
 print-failures clean-failures:
 	../../tests/run-tests.py --$@
 
 
-# CIRCUITPY: support for passing args to run-tests, like `make test TEST_ARGS="basics/*.py"`
+# CIRCUITPY-CHANGE: support for passing args to run-tests, like `make test TEST_ARGS="basics/*.py"`
 TEST_ARGS ?=
 test: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
 	$(eval DIRNAME=ports/$(notdir $(CURDIR)))