Add one-versus-many-matches logic to network filter plugin (#30511)

* Add one-versus-many-matches logic

* Fixed indentation (tabs ==> spaces)
This commit is contained in:
Ivan Pepelnjak 2017-09-26 14:44:07 +02:00 committed by Peter Sprygada
parent d23af439ca
commit 9aa1da23f0

View file

@ -56,7 +56,10 @@ def re_matchall(regex, value):
obj = {} obj = {}
if regex.groupindex: if regex.groupindex:
for name, index in iteritems(regex.groupindex): for name, index in iteritems(regex.groupindex):
obj[name] = match[index - 1] if len(regex.groupindex) == 1:
obj[name] = match
else:
obj[name] = match[index - 1]
objects.append(obj) objects.append(obj)
return objects return objects