-def populate_simple_opt_with_data(opt, data, data_type: str):
- assert(opt.opt_type != 'complex'), \
- f'unexpected ComplexOptCheck "{opt.name}"'
- assert(opt.opt_type in SIMPLE_OPTION_TYPES), \
- f'invalid opt_type "{opt.opt_type}"'
- assert(data_type in SIMPLE_OPTION_TYPES), \
- f'invalid data_type "{data_type}"'
- assert(data), \
- 'empty data'
+# 3) objects that can be added to the checklist
+ChecklistObjType = Union[KconfigCheck, CmdlineCheck, SysctlCheck, OR, AND]
+
+# 4) all existing objects
+AnyOptCheckType = Union[KconfigCheck, CmdlineCheck, SysctlCheck, VersionCheck, OR, AND]
+
+
+def populate_simple_opt_with_data(opt: SimpleOptCheckType, data: TupleOrOrderedDict, data_type: str) -> None:
+ assert(opt.opt_type != 'complex'), f'unexpected opt_type "{opt.opt_type}" for {opt}'
+ assert(opt.opt_type in SIMPLE_OPTION_TYPES), f'invalid opt_type "{opt.opt_type}"'
+ assert(data_type in SIMPLE_OPTION_TYPES), f'invalid data_type "{data_type}"'
+ assert(data), 'empty data'