summaryrefslogtreecommitdiffstats
path: root/jenkins_jobs
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-12-16 15:00:56 +0000
committerGerrit Code Review <review@openstack.org>2019-12-16 15:00:56 +0000
commit63d877945d1474296ab6ba45ad3e6dcd753081f1 (patch)
treecb0c2c61eba8fc9ef8df717c23d277431691e243 /jenkins_jobs
parent2ea9841a9696d7e8c7cc9281dfd8de4498926090 (diff)
parent0b4ed38ca6c50f61636fd98bedf759f2198ac5e4 (diff)
downloadpython-jenkins-job-builder-63d877945d1474296ab6ba45ad3e6dcd753081f1.tar.gz
python-jenkins-job-builder-63d877945d1474296ab6ba45ad3e6dcd753081f1.tar.xz
python-jenkins-job-builder-63d877945d1474296ab6ba45ad3e6dcd753081f1.zip
Merge "Fix the yaml load warning."3.2.0
Diffstat (limited to 'jenkins_jobs')
-rw-r--r--jenkins_jobs/cache.py2
-rw-r--r--jenkins_jobs/cli/entry.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/jenkins_jobs/cache.py b/jenkins_jobs/cache.py
index 01769295..62621b56 100644
--- a/jenkins_jobs/cache.py
+++ b/jenkins_jobs/cache.py
@@ -59,7 +59,7 @@ class JobCache(object):
self.data = {}
else:
with io.open(self.cachefilename, "r", encoding="utf-8") as yfile:
- self.data = yaml.load(yfile)
+ self.data = yaml.safe_load(yfile)
logger.debug("Using cache: '{0}'".format(self.cachefilename))
def _lock(self):
diff --git a/jenkins_jobs/cli/entry.py b/jenkins_jobs/cli/entry.py
index e67ecb24..3aa24fe1 100644
--- a/jenkins_jobs/cli/entry.py
+++ b/jenkins_jobs/cli/entry.py
@@ -101,7 +101,7 @@ class JenkinsJobs(object):
with io.open(
self.options.plugins_info_path, "r", encoding="utf-8"
) as yaml_file:
- plugins_info = yaml.load(yaml_file)
+ plugins_info = yaml.safe_load(yaml_file)
if not isinstance(plugins_info, list):
self.parser.error(
"{0} must contain a Yaml list!".format(