Merge pull request #4317 from alex/patch-1

mboersma · mboersma · commit 8c0e7c980f6d · 2015-08-24T15:55:52.000-06:00
style(contrib/aws): Ensure that files are closed and use yaml.safe_load
diff --git a/contrib/aws/gen-json.py b/contrib/aws/gen-json.py
@@ -95,7 +95,8 @@
     dict({'name': 'etcd.service', 'drop-ins': [{'name': '90-after-etcd-volume.conf', 'content': ETCD_DROPIN}]})
 ]
 
-data = yaml.load(file(os.path.join(CURR_DIR, '..', 'coreos', 'user-data'), 'r'))
+with open(os.path.join(CURR_DIR, '..', 'coreos', 'user-data'), 'r') as f:
+    data = yaml.safe_load(f)
 
 # coreos-cloudinit will start the units in order, so we want these to be processed before etcd/fleet
 # are started

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,8 @@`
`95`	`95`	`dict({'name': 'etcd.service', 'drop-ins': [{'name': '90-after-etcd-volume.conf', 'content': ETCD_DROPIN}]})`
`96`	`96`	`]`
`97`	`97`
`98`		`-data = yaml.load(file(os.path.join(CURR_DIR, '..', 'coreos', 'user-data'), 'r'))`
	`98`	`+with open(os.path.join(CURR_DIR, '..', 'coreos', 'user-data'), 'r') as f:`
	`99`	`+ data = yaml.safe_load(f)`
`99`	`100`
`100`	`101`	`# coreos-cloudinit will start the units in order, so we want these to be processed before etcd/fleet`
`101`	`102`	`# are started`