summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2020-07-15 13:40:54 -0400
committerGitHub <noreply@github.com>2020-07-15 13:40:54 -0400
commit35450519dee869e5641cff94ed35acd3bdaa8a42 (patch)
tree7b751cbd3ccb987885fa2665ca55d6be803747c5 /synapse/federation
parentAvoid brand new rooms in `delete_old_current_state_events` (#7854) (diff)
downloadsynapse-35450519dee869e5641cff94ed35acd3bdaa8a42.tar.xz
Ensure that calls to `json.dumps` are compatible with the standard library json. (#7836)
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/federation_server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py
index 2aab9c5f55..8c53330c49 100644
--- a/synapse/federation/federation_server.py
+++ b/synapse/federation/federation_server.py
@@ -14,10 +14,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
 import logging
 from typing import Any, Callable, Dict, List, Match, Optional, Tuple, Union
 
+from canonicaljson import json
 from prometheus_client import Counter, Histogram
 
 from twisted.internet import defer