Fix type checking against struct time

jepler · jepler · commit 21e2dfaee2d6 · 2021-07-07T08:43:18.000-05:00
diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
@@ -166,7 +166,7 @@ void struct_time_to_tm(mp_obj_t t, timeutils_struct_time_t *tm) {
     mp_obj_t *elems;
     size_t len;
 
-    if (!mp_obj_is_type(t, &mp_type_tuple) && !mp_obj_is_type(t, MP_OBJ_FROM_PTR(&struct_time_type_obj))) {
+    if (!mp_obj_is_type(t, &mp_type_tuple) && !mp_obj_is_type(t, &struct_time_type_obj.base)) {
         mp_raise_TypeError(translate("Tuple or struct_time argument required"));
     }
 
@@ -275,7 +275,7 @@ STATIC mp_obj_t time_mktime(mp_obj_t t) {
     mp_obj_t *elem;
     size_t len;
 
-    if (!mp_obj_is_type(t, &mp_type_tuple) && !mp_obj_is_type(t, MP_OBJ_FROM_PTR(&struct_time_type_obj))) {
+    if (!mp_obj_is_type(t, &mp_type_tuple) && !mp_obj_is_type(t, &struct_time_type_obj.base)) {
         mp_raise_TypeError(translate("Tuple or struct_time argument required"));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ void struct_time_to_tm(mp_obj_t t, timeutils_struct_time_t *tm) {`
`166`	`166`	`mp_obj_t *elems;`
`167`	`167`	`size_t len;`
`168`	`168`
`169`		`- if (!mp_obj_is_type(t, &mp_type_tuple) && !mp_obj_is_type(t, MP_OBJ_FROM_PTR(&struct_time_type_obj))) {`
	`169`	`+ if (!mp_obj_is_type(t, &mp_type_tuple) && !mp_obj_is_type(t, &struct_time_type_obj.base)) {`
`170`	`170`	`mp_raise_TypeError(translate("Tuple or struct_time argument required"));`
`171`	`171`	`}`
`172`	`172`
`@@ -275,7 +275,7 @@ STATIC mp_obj_t time_mktime(mp_obj_t t) {`
`275`	`275`	`mp_obj_t *elem;`
`276`	`276`	`size_t len;`
`277`	`277`
`278`		`- if (!mp_obj_is_type(t, &mp_type_tuple) && !mp_obj_is_type(t, MP_OBJ_FROM_PTR(&struct_time_type_obj))) {`
	`278`	`+ if (!mp_obj_is_type(t, &mp_type_tuple) && !mp_obj_is_type(t, &struct_time_type_obj.base)) {`
`279`	`279`	`mp_raise_TypeError(translate("Tuple or struct_time argument required"));`
`280`	`280`	`}`
`281`	`281`