MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-17 18:43:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3048 from matrix-org/rav/use_simplejson

Browse source 
Use simplejson throughout
This commit is contained in:
Richard van der Hoff 2018-04-03 14:39:57 +01:00 committed by GitHub
commit 0ca5c4d2af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
synapse/api/errors.py
View file

@ -15,9 +15,10 @@
"""Contains exceptions and error codes."""
import json
import logging
import simplejson as json
logger = logging.getLogger(__name__)

8
synapse/handlers/identity.py
View file

@ -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__)

3
synapse/storage/schema/delta/14/upgrade_appservice_db.py
View file

@ -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__)