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:
@@ -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
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user