openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "yaml-validate: sets isn't python3"

Browse Source
This commit is contained in:
Zuul
2018-05-14 23:16:57 +00:00
committed by Gerrit Code Review
parent 02efe58a62 af7a4ab5b8
commit a189f37216
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/yaml-validate.py
View File

@@ -19,7 +19,6 @@ import traceback
import yaml
from copy import copy
from sets import Set
# Only permit the template alias versions.
# The current template version should be the last element.
@@ -746,7 +745,7 @@ def _rsearch_keys(d, pattern, search_keynames=False, enter_lists=False):
if re.search(pattern, target):
present = False
for entry in result:
if Set(path).issubset(Set(entry)):
if set(path).issubset(set(entry)):
present = True
break
if not present:
@@ -764,7 +763,7 @@ def _rsearch_keys(d, pattern, search_keynames=False, enter_lists=False):
if re.search(pattern, str(d[ind])):
present = False
for entry in result:
if Set(path).issubset(Set(entry)):
if set(path).issubset(set(entry)):
present = True
break
if not present: