OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Blunty replace json with simplejson

pull/66/head
Erik Johnston 2015-02-11 14:23:10 +00:00
parent d4abeb8354
commit 4ebbaf0d43
21 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/crypto/keyclient.py
View File

@ -19,7 +19,7 @@ from twisted.internet.protocol import Factory
from twisted.internet import defer, reactor from twisted.internet import defer, reactor
from synapse.http.endpoint import matrix_federation_endpoint from synapse.http.endpoint import matrix_federation_endpoint
from synapse.util.logcontext import PreserveLoggingContext from synapse.util.logcontext import PreserveLoggingContext
import json import simplejson as json
import logging import logging

2
synapse/federation/persistence.py
View File

@ -23,7 +23,7 @@ from twisted.internet import defer
from synapse.util.logutils import log_function from synapse.util.logutils import log_function
import json import simplejson as json
import logging import logging

2
synapse/federation/transport/server.py
View File

@ -20,7 +20,7 @@ from synapse.api.errors import Codes, SynapseError
from synapse.util.logutils import log_function from synapse.util.logutils import log_function
import logging import logging
import json import simplejson as json
import re import re

2
synapse/http/client.py
View File

@ -23,7 +23,7 @@ from twisted.web.http_headers import Headers
from StringIO import StringIO from StringIO import StringIO
import json import simplejson as json
import logging import logging
import urllib import urllib

2
synapse/http/matrixfederationclient.py
View File

@ -33,7 +33,7 @@ from synapse.api.errors import (
from syutil.crypto.jsonsign import sign_json from syutil.crypto.jsonsign import sign_json
import json import simplejson as json
import logging import logging
import urllib import urllib
import urlparse import urlparse

2
synapse/push/__init__.py
View File

@ -22,7 +22,7 @@ import synapse.util.async
import baserules import baserules
import logging import logging
import json import simplejson as json
import re import re
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

2
synapse/push/pusherpool.py
View File

@ -20,7 +20,7 @@ from httppusher import HttpPusher
from synapse.push import PusherConfigException from synapse.push import PusherConfigException
import logging import logging
import json import simplejson as json
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

2
synapse/rest/client/v1/directory.py
View File

@ -20,7 +20,7 @@ from synapse.api.errors import AuthError, SynapseError, Codes
from synapse.types import RoomAlias from synapse.types import RoomAlias
from .base import ClientV1RestServlet, client_path_pattern from .base import ClientV1RestServlet, client_path_pattern
import json import simplejson as json
import logging import logging

2
synapse/rest/client/v1/login.py
View File

@ -19,7 +19,7 @@ from synapse.api.errors import SynapseError
from synapse.types import UserID from synapse.types import UserID
from base import ClientV1RestServlet, client_path_pattern from base import ClientV1RestServlet, client_path_pattern
import json import simplejson as json
class LoginRestServlet(ClientV1RestServlet): class LoginRestServlet(ClientV1RestServlet):

2
synapse/rest/client/v1/presence.py
View File

@ -21,7 +21,7 @@ from synapse.api.errors import SynapseError
from synapse.types import UserID from synapse.types import UserID
from .base import ClientV1RestServlet, client_path_pattern from .base import ClientV1RestServlet, client_path_pattern
import json import simplejson as json
import logging import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

2
synapse/rest/client/v1/profile.py
View File

@ -19,7 +19,7 @@ from twisted.internet import defer
from .base import ClientV1RestServlet, client_path_pattern from .base import ClientV1RestServlet, client_path_pattern
from synapse.types import UserID from synapse.types import UserID
import json import simplejson as json
class ProfileDisplaynameRestServlet(ClientV1RestServlet): class ProfileDisplaynameRestServlet(ClientV1RestServlet):

2
synapse/rest/client/v1/push_rule.py
View File

@ -27,7 +27,7 @@ from synapse.push.rulekinds import (
PRIORITY_CLASS_MAP, PRIORITY_CLASS_INVERSE_MAP PRIORITY_CLASS_MAP, PRIORITY_CLASS_INVERSE_MAP
) )
import json import simplejson as json
class PushRuleRestServlet(ClientV1RestServlet): class PushRuleRestServlet(ClientV1RestServlet):

2
synapse/rest/client/v1/pusher.py
View File

@ -19,7 +19,7 @@ from synapse.api.errors import SynapseError, Codes
from synapse.push import PusherConfigException from synapse.push import PusherConfigException
from .base import ClientV1RestServlet, client_path_pattern from .base import ClientV1RestServlet, client_path_pattern
import json import simplejson as json
class PusherRestServlet(ClientV1RestServlet): class PusherRestServlet(ClientV1RestServlet):

2
synapse/rest/client/v1/register.py
View File

@ -25,7 +25,7 @@ from synapse.util.async import run_on_reactor
from hashlib import sha1 from hashlib import sha1
import hmac import hmac
import json import simplejson as json
import logging import logging
import urllib import urllib

2
synapse/rest/client/v1/room.py
View File

@ -23,7 +23,7 @@ from synapse.api.constants import EventTypes, Membership
from synapse.types import UserID, RoomID, RoomAlias from synapse.types import UserID, RoomID, RoomAlias
from synapse.events.utils import serialize_event from synapse.events.utils import serialize_event
import json import simplejson as json
import logging import logging
import urllib import urllib

2
synapse/rest/client/v2_alpha/filter.py
View File

@ -21,7 +21,7 @@ from synapse.types import UserID
from ._base import client_v2_pattern from ._base import client_v2_pattern
import json import simplejson as json
import logging import logging

2
synapse/rest/media/v0/content_repository.py
View File

@ -25,7 +25,7 @@ from twisted.web import server, resource
from twisted.internet import defer from twisted.internet import defer
import base64 import base64
import json import simplejson as json
import logging import logging
import os import os
import re import re

2
synapse/storage/__init__.py
View File

@ -44,7 +44,7 @@ from syutil.jsonutil import encode_canonical_json
from synapse.crypto.event_signing import compute_event_reference_hash from synapse.crypto.event_signing import compute_event_reference_hash
import json import simplejson as json
import logging import logging
import os import os

2
synapse/storage/_base.py
View File

@ -23,7 +23,7 @@ from synapse.util.logcontext import PreserveLoggingContext, LoggingContext
from twisted.internet import defer from twisted.internet import defer
import collections import collections
import json import simplejson as json
import sys import sys
import time import time

2
synapse/storage/filtering.py
View File

@ -17,7 +17,7 @@ from twisted.internet import defer
from ._base import SQLBaseStore from ._base import SQLBaseStore
import json import simplejson as json
class FilteringStore(SQLBaseStore): class FilteringStore(SQLBaseStore):

2
synapse/storage/push_rule.py
View File

@ -20,7 +20,7 @@ from twisted.internet import defer
import logging import logging
import copy import copy
import json import simplejson as json
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)