Modification to PR to support python 2 and 3

This commit is contained in:
Dale McDiarmid 2017-08-18 18:06:03 +01:00
parent e3d73eeb12
commit 0dce36928a

View file

@ -2,6 +2,7 @@ __author__ = 'dale mcdiarmid'
import re import re
import os.path import os.path
from six import string_types
def modify_list(values=[], pattern='', replacement='', ignorecase=False): def modify_list(values=[], pattern='', replacement='', ignorecase=False):
''' Perform a `re.sub` on every item in the list''' ''' Perform a `re.sub` on every item in the list'''
@ -13,7 +14,7 @@ def modify_list(values=[], pattern='', replacement='', ignorecase=False):
return [_re.sub(replacement, value) for value in values] return [_re.sub(replacement, value) for value in values]
def append_to_list(values=[], suffix=''): def append_to_list(values=[], suffix=''):
if isinstance(values, str): if isinstance(values, string_types):
values = values.split(',') values = values.split(',')
return [str(value+suffix) for value in values] return [str(value+suffix) for value in values]
@ -48,3 +49,4 @@ class FilterModule(object):
'filter_reserved':filter_reserved, 'filter_reserved':filter_reserved,
'filename':filename} 'filename':filename}
print(append_to_list(values="/var/lib/elasticsearch",suffix="/test"))