diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-11 14:23:10 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-11 14:23:10 +0000 |
| commit | 4ebbaf0d4382813ba896f3e8101de12e112cbed5 (patch) | |
| tree | 179bf2e1a0d0330437518eff45788604ab2f4ad7 /synapse/federation | |
| parent | Mention new libs in CHANGES (diff) | |
| download | synapse-4ebbaf0d4382813ba896f3e8101de12e112cbed5.tar.xz | |
Blunty replace json with simplejson
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/persistence.py | 2 | ||||
| -rw-r--r-- | synapse/federation/transport/server.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/persistence.py b/synapse/federation/persistence.py index 85c82a4623..8a1afc0ca5 100644 --- a/synapse/federation/persistence.py +++ b/synapse/federation/persistence.py @@ -23,7 +23,7 @@ from twisted.internet import defer from synapse.util.logutils import log_function -import json +import simplejson as json import logging diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 9c9f8d525b..2ffb37aa18 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -20,7 +20,7 @@ from synapse.api.errors import Codes, SynapseError from synapse.util.logutils import log_function import logging -import json +import simplejson as json import re |