diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-10-28 20:41:42 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-10-30 15:24:10 +0000 |
| commit | 90c900a8ff12cf330bb2010f13f3dfeb42930f41 (patch) | |
| tree | 70035405751a623c34852dc091b7a420c04c7fe0 /synapse/http/server.py | |
| parent | Tie together matches_user_in_member_list and get_users_in_room caches (#8676) (diff) | |
| download | synapse-90c900a8ff12cf330bb2010f13f3dfeb42930f41.tar.xz | |
Merge pull request #8678 from matrix-org/rav/fix_frozen_events
Fix serialisation errors when using third-party event rules.
Diffstat (limited to 'synapse/http/server.py')
| -rw-r--r-- | synapse/http/server.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index 00b98af3d4..d8e354f0a9 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -35,8 +35,6 @@ from twisted.web.server import NOT_DONE_YET, Request from twisted.web.static import File, NoRangeStaticProducer from twisted.web.util import redirectTo -import synapse.events -import synapse.metrics from synapse.api.errors import ( CodeMessageException, Codes, @@ -620,7 +618,7 @@ def respond_with_json( if pretty_print: encoder = iterencode_pretty_printed_json else: - if canonical_json or synapse.events.USE_FROZEN_DICTS: + if canonical_json: encoder = iterencode_canonical_json else: encoder = _encode_json_bytes |