attempt to fix some issues with 'contains()' (#2446)

add a third argument that gets used
when the values o search are given as a string
This commit is contained in:
Mike Fährmann
2022-04-08 14:40:26 +02:00
parent 4527a35aba
commit 7fe54bab2a
2 changed files with 14 additions and 13 deletions

View File

@@ -71,21 +71,17 @@ def unique_sequence(iterable):
yield element
def contains(values, elements):
def contains(values, elements, separator=" "):
"""Returns True if at least one of 'elements' is contained in 'values'"""
if not isinstance(elements, (tuple, list)):
elements = (elements,)
if isinstance(values, str):
fmt = r"\b{}\b".format
for e in elements:
if re.compile(fmt(re.escape(e))).search(values):
return True
else:
for e in elements:
if e in values:
return True
values = values.split(separator)
if not isinstance(elements, (tuple, list)):
return elements in values
for e in elements:
if e in values:
return True
return False