diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-07-15 13:40:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-15 13:40:54 -0400 |
| commit | 35450519dee869e5641cff94ed35acd3bdaa8a42 (patch) | |
| tree | 7b751cbd3ccb987885fa2665ca55d6be803747c5 /synapse/http | |
| parent | Avoid brand new rooms in `delete_old_current_state_events` (#7854) (diff) | |
| download | synapse-35450519dee869e5641cff94ed35acd3bdaa8a42.tar.xz | |
Ensure that calls to `json.dumps` are compatible with the standard library json. (#7836)
Diffstat (limited to 'synapse/http')
| -rw-r--r-- | synapse/http/client.py | 4 | ||||
| -rw-r--r-- | synapse/http/servlet.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py index b80681135e..6bc51202cd 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py @@ -13,13 +13,13 @@ # 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 urllib from io import BytesIO import treq -from canonicaljson import encode_canonical_json +from canonicaljson import encode_canonical_json, json from netaddr import IPAddress from prometheus_client import Counter from zope.interface import implementer, provider diff --git a/synapse/http/servlet.py b/synapse/http/servlet.py index 3cabe9d02e..a34e5ead88 100644 --- a/synapse/http/servlet.py +++ b/synapse/http/servlet.py @@ -14,9 +14,11 @@ # limitations under the License. """ This module contains base REST classes for constructing REST servlets. """ -import json + import logging +from canonicaljson import json + from synapse.api.errors import Codes, SynapseError logger = logging.getLogger(__name__) |