mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-14 11:57:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Do not use simplejson in Synapse. (#7800)

Browse source
This commit is contained in:
Patrick Cloke 2020-07-08 07:15:08 -04:00 committed by GitHub
parent ff0680f69d
commit e7efd8f827
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/7800.misc Normal file
View file

@ -0,0 +1 @@
Switch from simplejson to the standard library json.

9
synapse/replication/tcp/commands.py
View file

@ -18,18 +18,11 @@ The VALID_SERVER_COMMANDS and VALID_CLIENT_COMMANDS define which commands are
allowed to be sent by which side.
"""
import abc
import json
import logging
import platform
from typing import Tuple, Type
if platform.python_implementation() == "PyPy":
import json
_json_encoder = json.JSONEncoder()
else:
import simplejson as json # type: ignore[no-redef] # noqa: F821
_json_encoder = json.JSONEncoder(namedtuple_as_object=False) # type: ignore[call-arg] # noqa: F821
logger = logging.getLogger(__name__)

6
synapse/storage/data_stores/main/schema/delta/25/fts.py
View file

@ -11,11 +11,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import json
import logging
import simplejson
from synapse.storage.engines import PostgresEngine, Sqlite3Engine
from synapse.storage.prepare_database import get_statements
@ -66,7 +64,7 @@ def run_create(cur, database_engine, *args, **kwargs):
"max_stream_id_exclusive": max_stream_id + 1,
"rows_inserted": 0,
}
progress_json = simplejson.dumps(progress)
progress_json = json.dumps(progress)
sql = (
"INSERT into background_updates (update_name, progress_json)"

6
synapse/storage/data_stores/main/schema/delta/27/ts.py
View file

@ -11,11 +11,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import json
import logging
import simplejson
from synapse.storage.prepare_database import get_statements
logger = logging.getLogger(__name__)
@ -45,7 +43,7 @@ def run_create(cur, database_engine, *args, **kwargs):
"max_stream_id_exclusive": max_stream_id + 1,
"rows_inserted": 0,
}
progress_json = simplejson.dumps(progress)
progress_json = json.dumps(progress)
sql = (
"INSERT into background_updates (update_name, progress_json)"

6
synapse/storage/data_stores/main/schema/delta/31/search_update.py
View file

@ -11,11 +11,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import json
import logging
import simplejson
from synapse.storage.engines import PostgresEngine
from synapse.storage.prepare_database import get_statements
@ -50,7 +48,7 @@ def run_create(cur, database_engine, *args, **kwargs):
"rows_inserted": 0,
"have_added_indexes": False,
}
progress_json = simplejson.dumps(progress)
progress_json = json.dumps(progress)
sql = (
"INSERT into background_updates (update_name, progress_json)"

6
synapse/storage/data_stores/main/schema/delta/33/event_fields.py
View file

@ -11,11 +11,9 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import json
import logging
import simplejson
from synapse.storage.prepare_database import get_statements
logger = logging.getLogger(__name__)
@ -45,7 +43,7 @@ def run_create(cur, database_engine, *args, **kwargs):
"max_stream_id_exclusive": max_stream_id + 1,
"rows_inserted": 0,
}
progress_json = simplejson.dumps(progress)
progress_json = json.dumps(progress)
sql = (
"INSERT into background_updates (update_name, progress_json)"