summary refs log tree commit diff
path: root/synapse/http/servlet.py
diff options
context:
space:
mode:
authorWill Hunt <will@half-shot.uk>2018-07-27 12:26:52 +0100
committerWill Hunt <will@half-shot.uk>2018-07-27 12:26:52 +0100
commit46afacc215db24b128e502c2c23cc3f3205d6f70 (patch)
treeeb8bd164bcc1b49b507e4d41c900325bcbfc5a5a /synapse/http/servlet.py
parentAuth media/r0/config (diff)
parentMerge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pid (diff)
downloadsynapse-46afacc215db24b128e502c2c23cc3f3205d6f70.tar.xz
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
Diffstat (limited to 'synapse/http/servlet.py')
-rw-r--r--synapse/http/servlet.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/servlet.py b/synapse/http/servlet.py

index cf6723563a..882816dc8f 100644 --- a/synapse/http/servlet.py +++ b/synapse/http/servlet.py
@@ -206,7 +206,7 @@ def parse_json_object_from_request(request, allow_empty_body=False): return content -def assert_params_in_request(body, required): +def assert_params_in_dict(body, required): absent = [] for k in required: if k not in body: