fix the default value for types_or

This commit is contained in:
Anthony Sottile
2020-11-25 18:21:37 -08:00
parent b5baf5c807
commit 89ab609732
4 changed files with 28 additions and 3 deletions

View File

@@ -61,7 +61,7 @@ MANIFEST_HOOK_DICT = cfgv.Map(
cfgv.Optional('files', check_string_regex, ''),
cfgv.Optional('exclude', check_string_regex, '^$'),
cfgv.Optional('types', cfgv.check_array(check_type_tag), ['file']),
cfgv.Optional('types_or', cfgv.check_array(check_type_tag), ['file']),
cfgv.Optional('types_or', cfgv.check_array(check_type_tag), []),
cfgv.Optional('exclude_types', cfgv.check_array(check_type_tag), []),
cfgv.Optional(

View File

@@ -92,7 +92,11 @@ class Classifier:
ret = []
for filename in names:
tags = self._types_for_file(filename)
if tags >= types and tags & types_or and not tags & exclude_types:
if (
tags >= types and
(not types_or or tags & types_or) and
not tags & exclude_types
):
ret.append(filename)
return ret