Mirrors/yamllint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge the two if conditions

Browse Source
This commit is contained in:
Leo Feyer
2020-04-10 09:59:29 +02:00
parent 2296ec63b8
commit 91cb70b8af
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
yamllint/rules/quoted_strings.py
View File

@@ -128,6 +128,7 @@ def check(conf, token, prev, next, nextnext, context):
quote_type = conf['quote-type']
required = conf['required']
extra_regex = conf['needed-extra-regex']
# Completely relaxed about quotes (same as the rule being disabled)
if required is False and quote_type == 'any':
@@ -150,12 +151,10 @@ def check(conf, token, prev, next, nextnext, context):
# Quotes are disallowed when not needed
if (tag == DEFAULT_SCALAR_TAG and token.value
and token.value[0] not in START_TOKENS):
extra_regex = conf['needed-extra-regex']
if extra_regex == '' or not re.search(extra_regex, token.value):
msg = "string value is redundantly quoted with %s quotes" % (
quote_type)
and token.value[0] not in START_TOKENS and (extra_regex == ''
or not re.search(extra_regex, token.value))):
msg = "string value is redundantly quoted with %s quotes" % (
quote_type)
# But when used need to match config
elif token.style and not quote_match(quote_type, token.style):