Skip to content

Commit 88dd1cd

Browse files
committed
optional template term count even simpler
1 parent 1be87d7 commit 88dd1cd

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

pyessv/parsing/identifiers/parser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ def parse_identifer(scope, identifier_type, identifier, strictness=PARSING_STRIC
2626
# retrieve optional collection in spec
2727
all_optional_template_str = re.findall("\[(.+?)\]", cfg.template)
2828
optional_template_part = [it for sub in [re.findall("%\((\w+)\)s", opt_col) for opt_col in all_optional_template_str] for it in sub]
29-
29+
3030
# Split identifier into a set of elements.
3131
elements = _get_elements(identifier_type, identifier, cfg.seperator)
32-
if len(elements) < len(cfg.specs)-len(optional_template_part) and len(elements) < len(cfg.specs)+len(optional_template_part):
32+
if len(cfg.specs)-len(optional_template_part) > len(elements) > len(cfg.specs)+len(optional_template_part):
3333
raise ValueError('Invalid identifier. Element count is invalid. Expected={}. Actual={}. Identifier = {}'.format(len(cfg.specs), len(elements), identifier))
3434

3535
# Strip suffix ...

0 commit comments

Comments
 (0)