Skip to content

Commit 367e13c

Browse files
dhalbertdhalbert
committed
change CIRCUITPY change markers to CIRCUITPY-CHANGE
1 parent c0a4abc commit 367e13c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+274
-271
lines changed

‎extmod/extmod.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This makefile fragment adds the source code files for the core extmod modules
22
# and provides rules to build 3rd-party components for extmod modules.
33

4-
# CIRCUITPY has removed many extmod modules.
4+
# CIRCUITPY-CHANGE: many extmod modules removed
55
SRC_EXTMOD_C += \
66
extmod/modasyncio.c \
77
extmod/modbinascii.c \

‎extmod/modasyncio.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ STATIC mp_obj_t task_cancel(mp_obj_t self_in) {
228228
}
229229
STATIC MP_DEFINE_CONST_FUN_OBJ_1(task_cancel_obj, task_cancel);
230230

231-
// CIRCUITPY provides __await__().
231+
// CIRCUITPY-CHANGE: CircuitPython provides __await__().
232232
STATIC mp_obj_t task_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf);
233233

234234
STATIC mp_obj_t task_await(mp_obj_t self_in) {

‎extmod/modbinascii.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ STATIC mp_obj_t mod_binascii_b2a_base64(size_t n_args, const mp_obj_t *pos_args,
127127
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
128128
mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
129129
uint8_t newline = args[ARG_newline].u_bool;
130-
// CIRCUITPY
130+
// CIRCUITPY-CHANGE
131131
check_not_unicode(pos_args[0]);
132132
mp_buffer_info_t bufinfo;
133133
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,
182182
}
183183
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_binascii_b2a_base64_obj, 1, mod_binascii_b2a_base64);
184184

185-
// CIRCUITPY uses a self-contained implementation of CRC32,
185+
// CIRCUITPY-CHANGE: uses a self-contained implementation of CRC32,
186186
// instead of depending on uzlib, like MicroPython.
187187

188188
/*
@@ -223,7 +223,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_KW(mod_binascii_b2a_base64_obj, 1, mod_binascii_b
223223

224224
STATIC mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) {
225225
mp_buffer_info_t bufinfo;
226-
// CIRCUITPY
226+
// CIRCUITPY-CHANGE
227227
check_not_unicode(args[0]);
228228
mp_get_buffer_raise(args[0], &bufinfo, MP_BUFFER_READ);
229229
uint32_t crc = (n_args > 1) ? mp_obj_get_int_truncated(args[1]) : 0;

‎extmod/modjson.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ typedef struct _json_stream_t {
130130
mp_obj_t stream_obj;
131131
mp_uint_t (*read)(mp_obj_t obj, void *buf, mp_uint_t size, int *errcode);
132132
int errcode;
133-
// CIRCUITPY
133+
// CIRCUITPY-CHANGE
134134
mp_obj_t python_readinto[2 + 1];
135135
mp_obj_array_t bytearray_obj;
136136
size_t start;
@@ -154,7 +154,7 @@ STATIC byte json_stream_next(json_stream_t *s) {
154154
return s->cur;
155155
}
156156

157-
// CIRCUITPY
157+
// CIRCUITPY-CHANGE
158158

159159
// We read from an object's `readinto` method in chunks larger than the json
160160
// 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) {
398398
}
399399
}
400400
success:
401-
// CIRCUITPY
401+
// CIRCUITPY-CHANGE
402402

403403
// It is legal for a stream to have contents after JSON.
404404
// E.g., A UART is not closed after receiving an object; in load() we will

‎extmod/modre.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ STATIC mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
206206
size_t len;
207207
subj.begin_line = subj.begin = mp_obj_str_get_data(args[1], &len);
208208
subj.end = subj.begin + len;
209-
// CIRCUITPY
209+
// CIRCUITPY-CHANGE
210210
#if MICROPY_PY_RE_MATCH_SPAN_START_END && !(defined(MICROPY_ENABLE_DYNRUNTIME) && MICROPY_ENABLE_DYNRUNTIME)
211211

212212
if (n_args > 2) {

‎extmod/modselect.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ STATIC mp_uint_t poll_set_poll_until_ready_or_timeout(poll_set_t *poll_set, size
367367
if (n_ready > 0 || (timeout != (mp_uint_t)-1 && mp_hal_ticks_ms() - start_ticks >= timeout)) {
368368
return n_ready;
369369
}
370-
// CIRCUITPY
370+
// CIRCUITPY-CHANGE
371371
RUN_BACKGROUND_TASKS;
372372
if (mp_hal_is_interrupted()) {
373373
return 0;
@@ -425,7 +425,7 @@ STATIC mp_obj_t select_select(size_t n_args, const mp_obj_t *args) {
425425
if (!mp_map_slot_is_filled(&poll_set.map, i)) {
426426
continue;
427427
}
428-
// CIRCUITPY
428+
// CIRCUITPY-CHANGE
429429
RUN_BACKGROUND_TASKS;
430430

431431
poll_obj_t *poll_obj = MP_OBJ_TO_PTR(poll_set.map.table[i].value);

‎extmod/vfs.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ mp_obj_t mp_vfs_getcwd(void) {
365365
}
366366
MP_DEFINE_CONST_FUN_OBJ_0(mp_vfs_getcwd_obj, mp_vfs_getcwd);
367367

368-
// CIRCUITPY: accessible from shared-module/os/__init__.c
368+
// CIRCUITPY-CHANGE: accessible from shared-module/os/__init__.c
369369
mp_obj_t mp_vfs_ilistdir_it_iternext(mp_obj_t self_in) {
370370
mp_vfs_ilistdir_it_t *self = MP_OBJ_TO_PTR(self_in);
371371
if (self->is_iter) {

‎extmod/vfs_fat_file.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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
257257
m_del_obj(pyb_file_obj_t, o);
258258
mp_raise_OSError_errno_str(fresult_to_errno_table[res], path_in);
259259
}
260-
// CIRCUITPY does fast seek.
260+
// CIRCUITPY-CHANGE: does fast seek.
261261
// If we're reading, turn on fast seek.
262262
if (mode == FA_READ) {
263263
// One call to determine how much space we need.

‎lib/re1.5/compilecode.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ int re1_5_compilecode(ByteProg *prog, const char *re)
254254
return 0;
255255
}
256256

257-
// CIRCUITPY debug as main program
257+
// CIRCUITPY-CHANGE: debug as main program
258258
#if defined(DEBUG_COMPILECODE)
259259
#include <assert.h>
260260
void re1_5_fatal(char *x) {

‎ports/unix/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,13 +262,13 @@ include $(TOP)/py/mkrules.mk
262262

263263
.PHONY: test test_full
264264

265-
# CIRCUITPY: these two targets are ours
265+
# CIRCUITPY-CHANGE: these two targets are for CircuitPython builds
266266
.PHONY: print-failures clean-failures
267267
print-failures clean-failures:
268268
../../tests/run-tests.py --$@
269269

270270

271-
# CIRCUITPY: support for passing args to run-tests, like `make test TEST_ARGS="basics/*.py"`
271+
# CIRCUITPY-CHANGE: support for passing args to run-tests, like `make test TEST_ARGS="basics/*.py"`
272272
TEST_ARGS ?=
273273
test: $(BUILD)/$(PROG) $(TOP)/tests/run-tests.py
274274
$(eval DIRNAME=ports/$(notdir $(CURDIR)))

0 commit comments

Comments
 (0)