diff options
| author | Krombel <krombel@krombel.de> | 2018-07-13 21:53:01 +0200 |
|---|---|---|
| committer | Krombel <krombel@krombel.de> | 2018-07-13 21:53:01 +0200 |
| commit | 3366b9c534cc286fcbe218ab718fd9a9c6211da4 (patch) | |
| tree | c75be15b5880253c3c37ac23ad8421036e4e798b /synapse/federation/federation_base.py | |
| parent | Use parse_{int,str} and assert from http.servlet (diff) | |
| download | synapse-3366b9c534cc286fcbe218ab718fd9a9c6211da4.tar.xz | |
rename assert_params_in_request to assert_params_in_dict
the method "assert_params_in_request" does handle dicts and not requests. A request body has to be parsed to json before this method can be used
Diffstat (limited to 'synapse/federation/federation_base.py')
| -rw-r--r-- | synapse/federation/federation_base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py index f0c7a06718..c11798093d 100644 --- a/synapse/federation/federation_base.py +++ b/synapse/federation/federation_base.py @@ -23,7 +23,7 @@ from synapse.api.errors import Codes, SynapseError from synapse.crypto.event_signing import check_event_content_hash from synapse.events import FrozenEvent from synapse.events.utils import prune_event -from synapse.http.servlet import assert_params_in_request +from synapse.http.servlet import assert_params_in_dict from synapse.util import logcontext, unwrapFirstError logger = logging.getLogger(__name__) @@ -199,7 +199,7 @@ def event_from_pdu_json(pdu_json, outlier=False): """ # we could probably enforce a bunch of other fields here (room_id, sender, # origin, etc etc) - assert_params_in_request(pdu_json, ('event_id', 'type', 'depth')) + assert_params_in_dict(pdu_json, ('event_id', 'type', 'depth')) depth = pdu_json['depth'] if not isinstance(depth, six.integer_types): |