diff options
| author | Erik Johnston <erikj@jki.re> | 2018-03-28 10:00:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-28 10:00:06 +0100 |
| commit | e6d87c93f3794b4b8b1ace3a4f062cb3d6f27008 (patch) | |
| tree | d0860263d7bb837c79cbfe68e3660d5651435561 /synapse | |
| parent | Merge pull request #3033 from matrix-org/erikj/calculate_state_metrics (diff) | |
| parent | Remove last usage of ujson (diff) | |
| download | synapse-e6d87c93f3794b4b8b1ace3a4f062cb3d6f27008.tar.xz | |
Merge pull request #3030 from matrix-org/erikj/no_ujson
Remove last usage of ujson
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/python_dependencies.py | 1 | ||||
| -rw-r--r-- | synapse/storage/group_server.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/synapse/python_dependencies.py b/synapse/python_dependencies.py index 91179ce532..40eedb63cb 100644 --- a/synapse/python_dependencies.py +++ b/synapse/python_dependencies.py @@ -34,7 +34,6 @@ REQUIREMENTS = { "bcrypt": ["bcrypt>=3.1.0"], "pillow": ["PIL"], "pydenticon": ["pydenticon"], - "ujson": ["ujson"], "blist": ["blist"], "pysaml2>=3.0.0": ["saml2>=3.0.0"], "pymacaroons-pynacl": ["pymacaroons"], diff --git a/synapse/storage/group_server.py b/synapse/storage/group_server.py index 8fde1aab8e..d03858234b 100644 --- a/synapse/storage/group_server.py +++ b/synapse/storage/group_server.py @@ -19,7 +19,7 @@ from synapse.api.errors import SynapseError from ._base import SQLBaseStore -import ujson as json +import simplejson as json # The category ID for the "default" category. We don't store as null in the |