time: struct_time: allow construction from another struct_time

jepler · jepler · commit 8f24ea48fbdd · 2019-11-26T08:45:40.000-06:00
This doesn't cover ALL the cases that CPython permits for construction of a struct_time, but it at least makes constructing from any namedtuple work. Closes: adafruit#2326
diff --git a/shared-bindings/time/__init__.c b/shared-bindings/time/__init__.c
@@ -87,7 +87,7 @@ mp_obj_t struct_time_make_new(const mp_obj_type_t *type, size_t n_args, const mp
     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) {
+    if (mp_obj_get_type(args[0])->getiter != mp_obj_tuple_getiter || ((mp_obj_tuple_t*) MP_OBJ_TO_PTR(args[0]))->len != 9) {
         mp_raise_TypeError(translate("time.struct_time() takes a 9-sequence"));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ mp_obj_t struct_time_make_new(const mp_obj_type_t *type, size_t n_args, const mp`
`87`	`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`		`- if (!MP_OBJ_IS_TYPE(args[0], &mp_type_tuple) \|\| ((mp_obj_tuple_t*) MP_OBJ_TO_PTR(args[0]))->len != 9) {`
	`90`	`+ if (mp_obj_get_type(args[0])->getiter != mp_obj_tuple_getiter \|\| ((mp_obj_tuple_t*) MP_OBJ_TO_PTR(args[0]))->len != 9) {`
`91`	`91`	`mp_raise_TypeError(translate("time.struct_time() takes a 9-sequence"));`
`92`	`92`	`}`
`93`	`93`