From 0eadf596eb60230b0d1e18f4e435a7b878037233 Mon Sep 17 00:00:00 2001 From: Gerard Costa Date: Thu, 17 Aug 2017 23:59:18 +0200 Subject: [PATCH 1/3] Change basestring by str to make it python3 compatible --- filter_plugins/custom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filter_plugins/custom.py b/filter_plugins/custom.py index 82b0efa..3d8ba48 100644 --- a/filter_plugins/custom.py +++ b/filter_plugins/custom.py @@ -13,7 +13,7 @@ def modify_list(values=[], pattern='', replacement='', ignorecase=False): return [_re.sub(replacement, value) for value in values] def append_to_list(values=[], suffix=''): - if isinstance(values, basestring): + if isinstance(values, str): values = values.split(',') return [str(value+suffix) for value in values] From 0dce36928a16307636cd3a1e8bae96c578cc9769 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Fri, 18 Aug 2017 18:06:03 +0100 Subject: [PATCH 2/3] Modification to PR to support python 2 and 3 --- filter_plugins/custom.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/filter_plugins/custom.py b/filter_plugins/custom.py index 3d8ba48..45eac28 100644 --- a/filter_plugins/custom.py +++ b/filter_plugins/custom.py @@ -2,6 +2,7 @@ __author__ = 'dale mcdiarmid' import re import os.path +from six import string_types def modify_list(values=[], pattern='', replacement='', ignorecase=False): ''' 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] def append_to_list(values=[], suffix=''): - if isinstance(values, str): + if isinstance(values, string_types): values = values.split(',') return [str(value+suffix) for value in values] @@ -48,3 +49,4 @@ class FilterModule(object): 'filter_reserved':filter_reserved, 'filename':filename} +print(append_to_list(values="/var/lib/elasticsearch",suffix="/test")) \ No newline at end of file From c0ae63db52fb37dafc7ddc7934d02560693ed0b8 Mon Sep 17 00:00:00 2001 From: Dale McDiarmid Date: Fri, 18 Aug 2017 18:19:53 +0100 Subject: [PATCH 3/3] Remove test function --- filter_plugins/custom.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/filter_plugins/custom.py b/filter_plugins/custom.py index 45eac28..ad22133 100644 --- a/filter_plugins/custom.py +++ b/filter_plugins/custom.py @@ -47,6 +47,4 @@ class FilterModule(object): 'array_to_str':array_to_str, 'extract_role_users':extract_role_users, 'filter_reserved':filter_reserved, - 'filename':filename} - -print(append_to_list(values="/var/lib/elasticsearch",suffix="/test")) \ No newline at end of file + 'filename':filename} \ No newline at end of file