diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-07-08 07:15:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-08 07:15:08 -0400 |
| commit | e7efd8f827be141cdda4355f19ec1b9170c11323 (patch) | |
| tree | 9eef549f304273f0401d40e315ae595d0bd11e7a /synapse/replication/tcp | |
| parent | Stop passing bytes when dumping JSON (#7799) (diff) | |
| download | synapse-e7efd8f827be141cdda4355f19ec1b9170c11323.tar.xz | |
Do not use simplejson in Synapse. (#7800)
Diffstat (limited to 'synapse/replication/tcp')
| -rw-r--r-- | synapse/replication/tcp/commands.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/synapse/replication/tcp/commands.py b/synapse/replication/tcp/commands.py index ea5937a20c..0f453ff0a8 100644 --- a/synapse/replication/tcp/commands.py +++ b/synapse/replication/tcp/commands.py @@ -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 +_json_encoder = json.JSONEncoder() logger = logging.getLogger(__name__) |