Fix filter wildcards. Closes #910.
This commit is contained in:
parent
6ef2f366f6
commit
408a70992c
2 changed files with 23 additions and 3 deletions
|
|
@ -1,4 +1,6 @@
|
|||
from __future__ import unicode_literals
|
||||
|
||||
import fnmatch
|
||||
import random
|
||||
import re
|
||||
import six
|
||||
|
|
@ -460,7 +462,11 @@ def is_filter_matching(obj, filter, filter_value):
|
|||
value = obj.get_filter_value(filter)
|
||||
|
||||
if isinstance(value, six.string_types):
|
||||
return value in filter_value
|
||||
if not isinstance(filter_value, list):
|
||||
filter_value = [filter_value]
|
||||
if any(fnmatch.fnmatch(value, pattern) for pattern in filter_value):
|
||||
return True
|
||||
return False
|
||||
|
||||
try:
|
||||
value = set(value)
|
||||
|
|
@ -479,7 +485,6 @@ def generic_filter(filters, objects):
|
|||
|
||||
|
||||
def simple_aws_filter_to_re(filter_string):
|
||||
import fnmatch
|
||||
tmp_filter = filter_string.replace('\?', '[?]')
|
||||
tmp_filter = tmp_filter.replace('\*', '[*]')
|
||||
tmp_filter = fnmatch.translate(tmp_filter)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue