summary refs log tree commit diff
path: root/synapse/events
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-22 16:34:35 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-22 16:34:35 +0100
commita31eb4a9fd1c6af6de0c5162d80736eae7bdaba6 (patch)
tree1fd39929c29ecd3836bda570dbf33cc4fe2a8b7d /synapse/events
parentMerge commit 'd34c6e127' into anoa/dinsic_release_1_31_0 (diff)
parentAdd an admin API endpoint to protect media. (#9086) (diff)
downloadsynapse-a31eb4a9fd1c6af6de0c5162d80736eae7bdaba6.tar.xz
Merge commit '3e4cdfe5d' into anoa/dinsic_release_1_31_0
Diffstat (limited to '')
-rw-r--r--synapse/events/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py

index 8028663fa8..3ec4120f85 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py
@@ -17,7 +17,6 @@ import abc import os -from distutils.util import strtobool from typing import Dict, Optional, Tuple, Type from unpaddedbase64 import encode_base64 @@ -26,6 +25,7 @@ from synapse.api.room_versions import EventFormatVersions, RoomVersion, RoomVers from synapse.types import JsonDict, RoomStreamToken from synapse.util.caches import intern_dict from synapse.util.frozenutils import freeze +from synapse.util.stringutils import strtobool # Whether we should use frozen_dict in FrozenEvent. Using frozen_dicts prevents # bugs where we accidentally share e.g. signature dicts. However, converting a @@ -34,6 +34,7 @@ from synapse.util.frozenutils import freeze # NOTE: This is overridden by the configuration by the Synapse worker apps, but # for the sake of tests, it is set here while it cannot be configured on the # homeserver object itself. + USE_FROZEN_DICTS = strtobool(os.environ.get("SYNAPSE_USE_FROZEN_DICTS", "0"))