diff options
author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-09-08 07:33:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-08 07:33:48 -0400 |
commit | 72bec36d50465557744720b3955277da9fa330c4 (patch) | |
tree | afb314fa0f698de80cc4fda4421bd67239eff4ff /synapse/api | |
parent | Allow for make_awaitable's return value to be re-used. (#8261) (diff) | |
download | synapse-72bec36d50465557744720b3955277da9fa330c4.tar.xz |
Directly import json from the standard library. (#8259)
By importing from canonicaljson the simplejson module was still being used in some situations. After this change the std lib json is consistenty used throughout Synapse.
Diffstat (limited to 'synapse/api')
-rw-r--r-- | synapse/api/filtering.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py index 2a2c9e6f13..bb33345be6 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py @@ -15,10 +15,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +import json from typing import List import jsonschema -from canonicaljson import json from jsonschema import FormatChecker from synapse.api.constants import EventContentFields |