commit a21ca51e38269c4e7ae11eaf2119662fa870ace2
author Jenkins <jenkins@review.openstack.org> Wed Jan 18 01:08:29 2017 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jan 18 01:08:29 2017 +0000
tree 9cc0d48d684ffbf09b80d05473e5471cad779c34
parent c5fd865b62e80765383285dab3c937d5f3696148
parent 40d02088e41df58526508c079e46b19cd14fe3ee

Merge "Replaces yaml.load() with yaml.safe_load()"

tempest/cmd/workspace.py

diff --git a/tempest/cmd/workspace.py b/tempest/cmd/workspace.py
index 3c58648..d2dc00d 100644
--- a/tempest/cmd/workspace.py
+++ b/tempest/cmd/workspace.py
@@ -151,7 +151,7 @@
         if not os.path.isfile(self.path):
             return
         with open(self.path, 'r') as f:
-            self.workspaces = yaml.load(f) or {}
+            self.workspaces = yaml.safe_load(f) or {}
 
 
 class TempestWorkspace(command.Command):

tempest/common/preprov_creds.py

diff --git a/tempest/common/preprov_creds.py b/tempest/common/preprov_creds.py
index 6a95588..a92d16a 100644
--- a/tempest/common/preprov_creds.py
+++ b/tempest/common/preprov_creds.py
@@ -33,7 +33,7 @@
 def read_accounts_yaml(path):
     try:
         with open(path, 'r') as yaml_file:
-            accounts = yaml.load(yaml_file)
+            accounts = yaml.safe_load(yaml_file)
     except IOError:
         raise lib_exc.InvalidConfiguration(
             'The path for the test accounts file: %s '