From d93a24ec1e5d39c57e302dd7a8b511038945f143 Mon Sep 17 00:00:00 2001 From: Anna Chen <66467383+Aonokishi@users.noreply.github.com> Date: Mon, 12 Aug 2024 02:59:28 +0200 Subject: [PATCH] Improve readability Co-authored-by: Jonathan Ehwald --- cfmtoolbox/plugins/featureide_import.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/cfmtoolbox/plugins/featureide_import.py b/cfmtoolbox/plugins/featureide_import.py index d7e1d5a..0540fe9 100644 --- a/cfmtoolbox/plugins/featureide_import.py +++ b/cfmtoolbox/plugins/featureide_import.py @@ -91,21 +91,17 @@ def traverse_xml(element: Element | None, cfm: CFM) -> list[Feature]: def parse_formula_value_and_feature(formula: Element, cfm: CFM) -> tuple[bool, Feature]: - if len(formula) == 0 and formula.tag == FormulaTypes.VAR.value: + if formula.tag == FormulaTypes.VAR.value and len(formula) == 0: if formula.text is None: raise TypeError("No valid feature name found in formula") return (True, cfm.find_feature(formula.text)) - if len(formula) != 1: - raise TooComplexConstraintError() - - if formula.tag == FormulaTypes.NOT.value: + if formula.tag == FormulaTypes.NOT.value and len(formula) == 1: value, feature = parse_formula_value_and_feature(formula[0], cfm) return (not value, feature) - else: - raise TooComplexConstraintError() + raise TooComplexConstraintError() def parse_constraints(