summary refs log tree commit diff
path: root/synapse/config/appservice.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-22 10:20:17 +0000
committerErik Johnston <erik@matrix.org>2019-03-22 10:20:17 +0000
commit3677548a82be347bcc69cfd4bfa4570581ee755f (patch)
tree0db80c2a0fb17c5fb9b3b5bd87f4691f5ac8adc7 /synapse/config/appservice.py
parentMerge pull request #4908 from matrix-org/erikj/block_peek_on_blocked_rooms (diff)
downloadsynapse-3677548a82be347bcc69cfd4bfa4570581ee755f.tar.xz
Use yaml safe_load
Diffstat (limited to 'synapse/config/appservice.py')
-rw-r--r--synapse/config/appservice.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/appservice.py b/synapse/config/appservice.py
index 9e64c76544..7e89d345d8 100644
--- a/synapse/config/appservice.py
+++ b/synapse/config/appservice.py
@@ -68,7 +68,7 @@ def load_appservices(hostname, config_files):
         try:
             with open(config_file, 'r') as f:
                 appservice = _load_appservice(
-                    hostname, yaml.load(f), config_file
+                    hostname, yaml.safe_load(f), config_file
                 )
                 if appservice.id in seen_ids:
                     raise ConfigError(