Merge pull request adafruit#1497 from jerryneedell/jerryn_fix_time

tannewt · web-flow · commit cd0aacccbd64 · 2019-01-25T13:55:57.000-08:00
fix kw_arg checking for time.struct_time()
diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
@@ -84,7 +84,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_obj, time_sleep);
 
 #if MICROPY_PY_COLLECTIONS
 mp_obj_t struct_time_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *args, mp_map_t *kw_args) {
-    if (n_args != 1 || kw_args != NULL || kw_args->used > 0) {
+    if (n_args != 1 || (kw_args != NULL && kw_args->used > 0)) {
         mp_raise_TypeError(translate("time.struct_time() takes exactly 1 argument"));
     }
     if (!MP_OBJ_IS_TYPE(args[0], &mp_type_tuple) || ((mp_obj_tuple_t*) MP_OBJ_TO_PTR(args[0]))->len != 9) {

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ MP_DEFINE_CONST_FUN_OBJ_1(time_sleep_obj, time_sleep);`
`84`	`84`
`85`	`85`	`#if MICROPY_PY_COLLECTIONS`
`86`	`86`	`mp_obj_t struct_time_make_new(const mp_obj_type_t type, size_t n_args, const mp_obj_t args, mp_map_t *kw_args) {`
`87`		`- if (n_args != 1 \|\| kw_args != NULL \|\| kw_args->used > 0) {`
	`87`	`+ if (n_args != 1 \|\| (kw_args != NULL && kw_args->used > 0)) {`
`88`	`88`	`mp_raise_TypeError(translate("time.struct_time() takes exactly 1 argument"));`
`89`	`89`	`}`
`90`	`90`	`if (!MP_OBJ_IS_TYPE(args[0], &mp_type_tuple) \|\| ((mp_obj_tuple_t*) MP_OBJ_TO_PTR(args[0]))->len != 9) {`