diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-01-15 15:59:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-15 15:59:20 +0000 |
| commit | 9ffac2bef1cbf74694280e4976605f3563f97074 (patch) | |
| tree | 21abb7e24d1e9222902ee185c936c03061e5e53a /synapse/events | |
| parent | Add type hints to media rest resources. (#9093) (diff) | |
| download | synapse-9ffac2bef1cbf74694280e4976605f3563f97074.tar.xz | |
Remote dependency on distutils (#9125)
`distutils` is pretty much deprecated these days, and replaced with `setuptools`. It's also annoying because it's you can't `pip install` it, and it's hard to figure out which debian package we should depend on to make sure it's there. Since we only use it for a tiny function anyway, let's just vendor said function into our codebase.
Diffstat (limited to 'synapse/events')
| -rw-r--r-- | synapse/events/__init__.py | 3 |
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")) |