diff options
| author | Erik Johnston <erik@matrix.org> | 2018-03-26 13:31:49 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-03-26 13:32:29 +0100 |
| commit | fecb45e0c38912f72655d53faa953e7713511e7f (patch) | |
| tree | 68a8e26fffa0c5c2f64b7ed628c94943b03ff3d9 | |
| parent | Update CHANGES.rst (diff) | |
| download | synapse-fecb45e0c38912f72655d53faa953e7713511e7f.tar.xz | |
Remove last usage of ujson
| -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 |