From d2eba382ccea9e38112dc8c596c923b6f53b288b Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Wed, 27 Feb 2019 15:36:01 +0100 Subject: [PATCH] Fix py3 compat for regex searches in YAML validate Closes-Bug: #1817914 Change-Id: I985d1a7750c18d42042d689c56efee90c20b809c Signed-off-by: Bogdan Dobrelya --- tools/yaml-validate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index e332656cfe..58b22ee6ae 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -909,7 +909,7 @@ def validate_service_hiera_interpol(f, tpl): # name. The only exception is allow anything under # str_replace['params'] ('str_replace;params' in the str notation). # We need to escape because of '$' char may be in templated params. - query = re.compile(r'\\;str\\_replace\\;params\\;\S*?net', + query = re.compile(r'\\;str(\\)?_replace\\;params\\;\S*?net', re.IGNORECASE) if not query.search(re.escape(path_str)): # Keep parsing, if foo_vip_network, or anything