sts-sponsors team mailing list archive

[Adam Collard <mp+436186@xxxxxxxxxxxxxxxxxx>]

Adam Collard has proposed merging ~adam-collard/maas-images:yaml-safe-load into maas-images:master.

Commit message:
LP:2003693 use yaml.safe_load() in favour of yaml.load



Requested reviews:
  maintainers of maas images (maas-images-maintainers)
Related bugs:
  Bug #2003693 in maas-images: "yaml.load missing required Loader on lunar"
  https://bugs.launchpad.net/maas-images/+bug/2003693

For more details, see:
https://code.launchpad.net/~adam-collard/maas-images/+git/maas-images/+merge/436186
-- 
Your team maintainers of maas images is requested to review the proposed merge of ~adam-collard/maas-images:yaml-safe-load into maas-images:master.

diff --git a/meph2/commands/build_image.py b/meph2/commands/build_image.py
old mode 100644
new mode 100755
index de05658..1c772b7
--- a/meph2/commands/build_image.py
+++ b/meph2/commands/build_image.py
@@ -99,7 +99,7 @@ def main():
     log.basicConfig(stream=args.log_file, level=level)
 
     with open(args.config, "r") as fp:
-        cfgdata = yaml.load(fp)
+        cfgdata = yaml.safe_load(fp)
 
     # --proposed only turns proposed on, not off.
     if not cfgdata.get('enable_proposed', False):
diff --git a/meph2/commands/cloudimg_sync.py b/meph2/commands/cloudimg_sync.py
index 79c9be4..07e3b17 100755
--- a/meph2/commands/cloudimg_sync.py
+++ b/meph2/commands/cloudimg_sync.py
@@ -270,7 +270,7 @@ def main():
     smirror = mirrors.UrlMirrorReader(source_url, policy=policy)
 
     with open(args.config) as fp:
-        cfgdata = yaml.load(fp)
+        cfgdata = yaml.safe_load(fp)
     if args.target is None:
         target = cfgdata['default_target']
     else:
diff --git a/meph2/stream.py b/meph2/stream.py
index 47a9abd..2d3cb7b 100644
--- a/meph2/stream.py
+++ b/meph2/stream.py
@@ -89,7 +89,7 @@ def create_version(arch, release, version_name, img_url, out_d,
 
     if cfgdata is None:
         with open(DEF_MEPH2_CONFIG) as fp:
-            cfgdata = yaml.load(fp)
+            cfgdata = yaml.safe_load(fp)
 
     rdata = None
     for r in cfgdata['releases']: