summary refs log tree commit diff
path: root/synapse/app/admin_cmd.py
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2020-09-08 07:33:48 -0400
committerGitHub <noreply@github.com>2020-09-08 07:33:48 -0400
commit72bec36d50465557744720b3955277da9fa330c4 (patch)
treeafb314fa0f698de80cc4fda4421bd67239eff4ff /synapse/app/admin_cmd.py
parentAllow for make_awaitable's return value to be re-used. (#8261) (diff)
downloadsynapse-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/app/admin_cmd.py')
-rw-r--r--synapse/app/admin_cmd.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/app/admin_cmd.py b/synapse/app/admin_cmd.py
index b6c9085670..7d309b1bb0 100644
--- a/synapse/app/admin_cmd.py
+++ b/synapse/app/admin_cmd.py
@@ -14,13 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import argparse
+import json
 import logging
 import os
 import sys
 import tempfile
 
-from canonicaljson import json
-
 from twisted.internet import defer, task
 
 import synapse