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/util/__init__.py | |
| 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/util/__init__.py')
| -rw-r--r-- | synapse/util/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/__init__.py b/synapse/util/__init__.py index 3ad4b28fc7..b2355700ad 100644 --- a/synapse/util/__init__.py +++ b/synapse/util/__init__.py @@ -13,11 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +import json import logging import re import attr -from canonicaljson import json from twisted.internet import defer, task |