diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-04-03 14:39:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-03 14:39:57 +0100 |
| commit | 0ca5c4d2af3d6c0249869801030d44fc860c1053 (patch) | |
| tree | c85be32a5201155f56672379a43a5cf10bd53c8e | |
| parent | Merge pull request #3043 from matrix-org/erikj/measure_state_group_creation (diff) | |
| parent | Use simplejson throughout (diff) | |
| download | synapse-0ca5c4d2af3d6c0249869801030d44fc860c1053.tar.xz | |
Merge pull request #3048 from matrix-org/rav/use_simplejson
Use simplejson throughout
| -rw-r--r-- | synapse/api/errors.py | 3 | ||||
| -rw-r--r-- | synapse/handlers/identity.py | 8 | ||||
| -rw-r--r-- | synapse/storage/schema/delta/14/upgrade_appservice_db.py | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py index aa15f73f36..bee59e80dd 100644 --- a/synapse/api/errors.py +++ b/synapse/api/errors.py @@ -15,9 +15,10 @@ """Contains exceptions and error codes.""" -import json import logging +import simplejson as json + logger = logging.getLogger(__name__) diff --git a/synapse/handlers/identity.py b/synapse/handlers/identity.py index 9efcdff1d6..91a0898860 100644 --- a/synapse/handlers/identity.py +++ b/synapse/handlers/identity.py @@ -15,6 +15,11 @@ # limitations under the License. """Utilities for interacting with Identity Servers""" + +import logging + +import simplejson as json + from twisted.internet import defer from synapse.api.errors import ( @@ -24,9 +29,6 @@ from ._base import BaseHandler from synapse.util.async import run_on_reactor from synapse.api.errors import SynapseError, Codes -import json -import logging - logger = logging.getLogger(__name__) diff --git a/synapse/storage/schema/delta/14/upgrade_appservice_db.py b/synapse/storage/schema/delta/14/upgrade_appservice_db.py index 8755bb2e49..4d725b92fe 100644 --- a/synapse/storage/schema/delta/14/upgrade_appservice_db.py +++ b/synapse/storage/schema/delta/14/upgrade_appservice_db.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json import logging +import simplejson as json + logger = logging.getLogger(__name__) |