]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
admin,doc/_ext/ceph_releases.py: use yaml.safe_load() 28463/head
authorKefu Chai <kchai@redhat.com>
Sun, 9 Jun 2019 14:10:51 +0000 (22:10 +0800)
committerKefu Chai <kchai@redhat.com>
Sun, 9 Jun 2019 14:20:14 +0000 (22:20 +0800)
see
https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation

Signed-off-by: Kefu Chai <kchai@redhat.com>
admin/build-doc
doc/_ext/ceph_releases.py

index 3fd52b447ffdd29a008247d4f512e103d3e4e194..d472f91c49665b2b058f4665c4055b5b65a63274 100755 (executable)
@@ -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
 
index bf6dd97f5a553c4096c9ba575bcedc47731e9517..057e13bbc817d5e1803d917e3cd98b287cfe2c0f 100644 (file)
@@ -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),