From d185c46a439c930fcacc8153dfaa2e030db80477 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 9 Jun 2019 22:10:51 +0800 Subject: [PATCH] admin,doc/_ext/ceph_releases.py: use yaml.safe_load() see https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation Signed-off-by: Kefu Chai --- admin/build-doc | 2 +- doc/_ext/ceph_releases.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/build-doc b/admin/build-doc index 3fd52b447ffd..d472f91c4966 100755 --- a/admin/build-doc +++ b/admin/build-doc @@ -138,7 +138,7 @@ def json_serialize(obj): return obj.isoformat() with open("$TOPDIR/doc/releases/releases.yml", 'r') as fp: - releases = yaml.load(fp) + releases = yaml.safe_load(fp) print(json.dumps(releases, indent=2, default=json_serialize)) EOF diff --git a/doc/_ext/ceph_releases.py b/doc/_ext/ceph_releases.py index bf6dd97f5a55..057e13bbc817 100644 --- a/doc/_ext/ceph_releases.py +++ b/doc/_ext/ceph_releases.py @@ -27,7 +27,7 @@ class CephReleases(Directive): env.note_dependency(filename) try: with open(filename, 'r') as fp: - releases = yaml.load(fp) + releases = yaml.safe_load(fp) releases = releases["releases"] except Exception as e: return [document.reporter.warning( @@ -118,7 +118,7 @@ class CephTimeline(Directive): env.note_dependency(filename) try: with open(filename, 'r') as fp: - releases = yaml.load(fp) + releases = yaml.safe_load(fp) except Exception as e: return [document.reporter.warning( "Failed to open Ceph releases file {}: {}".format(filename, e), -- 2.47.3