summary refs log tree commit diff
path: root/synapse/config/appservice.py
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 /synapse/config/appservice.py
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 '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(