summary refs log tree commit diff
path: root/scripts-dev
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2019-03-22 11:58:13 +0000
committerGitHub <noreply@github.com>2019-03-22 11:58:13 +0000
commit5fee9d8067b0078d13ec99b08f1a2ff471478f38 (patch)
tree1d2778edecc564dd5cfad09adb03cd236d6de4e3 /scripts-dev
parentAllow newsfragments to end with exclamation marks! (#4912) (diff)
parentNewsfile (diff)
downloadsynapse-5fee9d8067b0078d13ec99b08f1a2ff471478f38.tar.xz
Merge pull request #4869 from matrix-org/erikj/yaml_load
Fix yaml warnings by using safe_load
Diffstat (limited to 'scripts-dev')
-rw-r--r--scripts-dev/convert_server_keys.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts-dev/convert_server_keys.py b/scripts-dev/convert_server_keys.py
index dde8596697..ac152b5c42 100644
--- a/scripts-dev/convert_server_keys.py
+++ b/scripts-dev/convert_server_keys.py
@@ -76,7 +76,7 @@ def rows_v2(server, json):
 
 
 def main():
-    config = yaml.load(open(sys.argv[1]))
+    config = yaml.safe_load(open(sys.argv[1]))
     valid_until = int(time.time() / (3600 * 24)) * 1000 * 3600 * 24
 
     server_name = config["server_name"]