Reduced the complexity of BoMOptions.config (flake8)

This commit is contained in:
SET 2020-08-16 00:23:07 -03:00
parent 70cec67f19
commit 0097308e3c
1 changed files with 13 additions and 8 deletions

View File

@ -307,6 +307,17 @@ class BoMOptions(BaseOptions):
col = col[:-1]
return col
@staticmethod
def _normalize_variant(variant):
if isinstance(variant, type):
variant = []
elif isinstance(variant, str):
if variant:
variant = [variant]
else:
variant = []
return variant
def config(self):
super().config()
self.format = self._guess_format()
@ -352,14 +363,8 @@ class BoMOptions(BaseOptions):
for r in self.exclude_any:
r.column = self._fix_ref_field(r.column)
r.regex = compile(r.regex, flags=IGNORECASE)
# Variants
if isinstance(self.variant, type):
self.variant = []
elif isinstance(self.variant, str):
if self.variant:
self.variant = [self.variant]
else:
self.variant = []
# Variants, ensure a list
self.variant = self._normalize_variant(self.variant)
# Columns
self.column_rename = {}
self.join = []