Fix a couple more PyYAML signature changes

cf-platform-eng · Jul 29, 2022 · 32e4704 · 32e4704
1 parent c541d50
commit 32e4704
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/sample/diff_tile_metadata_yaml.py b/sample/diff_tile_metadata_yaml.py
@@ -14,8 +14,8 @@
 with open(sys.argv[2], 'r') as f:
     b = f.read()
 
-aa = yaml.load(a)
-bb = yaml.load(b)
+aa = yaml.load(a, yaml.Loader)
+bb = yaml.load(b, yaml.Loader)
 
 for conf in [aa, bb]:
     for release in conf['releases']:
@@ -26,7 +26,7 @@
     conf.pop('provides_product_versions')
     conf['property_blueprints'] = sorted(conf['property_blueprints'], key=lambda k: k['name'])
     conf['job_types'] = sorted(conf['job_types'], key=lambda k: k['name'])
-    for x in conf['job_types']: x['manifest'] = sorted(x['manifest'].items()) if type(x['manifest']) is dict else sorted(yaml.load(x['manifest']).items())
+    for x in conf['job_types']: x['manifest'] = sorted(x['manifest'].items()) if type(x['manifest']) is dict else sorted(yaml.load(x['manifest'], yaml.Loader).items())
 
 from pprint import pprint
 for x in list(dictdiffer.diff(aa,bb)): pprint(x); print('')

diff --git a/tile_generator/tile_metadata.py b/tile_generator/tile_metadata.py
@@ -554,7 +554,7 @@ def match_job_specific_prop_blueprints(job_name, prop_blueprints):
                         }
                         if template.get('consumes'):
                             if type(template.get('consumes')) is not dict:
-                                template['consumes'] = yaml.load(template['consumes'])
+                                template['consumes'] = yaml.load(template['consumes'], yaml.Loader)
                             temp['consumes'] = literal_unicode(yaml.dump(template.get('consumes'), default_flow_style=False))
                         if template.get('provides'):
                             temp['provides'] = literal_unicode(yaml.dump(template.get('provides'), default_flow_style=False))