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/util/frozenutils.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/util/frozenutils.py')
| -rw-r--r-- | synapse/util/frozenutils.py | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/synapse/util/frozenutils.py b/synapse/util/frozenutils.py index bf094c9386..5f7a6dd1d3 100644 --- a/synapse/util/frozenutils.py +++ b/synapse/util/frozenutils.py @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json - from frozendict import frozendict @@ -49,23 +47,3 @@ def unfreeze(o): pass return o - - -def _handle_frozendict(obj): - """Helper for EventEncoder. Makes frozendicts serializable by returning - the underlying dict - """ - if type(obj) is frozendict: - # fishing the protected dict out of the object is a bit nasty, - # but we don't really want the overhead of copying the dict. - return obj._dict - raise TypeError( - "Object of type %s is not JSON serializable" % obj.__class__.__name__ - ) - - -# A JSONEncoder which is capable of encoding frozendicts without barfing. -# Additionally reduce the whitespace produced by JSON encoding. -frozendict_json_encoder = json.JSONEncoder( - allow_nan=False, separators=(",", ":"), default=_handle_frozendict, -) |