Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix mypy errors with latest canonicaljson (#13905) 

* Lockfile: update canonicaljson 1.6.0 -> 1.6.3

* Fix mypy errors with latest canonicaljson

The change to `_encode_json_bytes` definition wasn't sufficient:

```
synapse/http/server.py:751: error: Incompatible types in assignment (expression has type "Callable[[Arg(object, 'json_object')], bytes]", variable has type "Callable[[Arg(object, 'data')], bytes]")  [assignment]
```

Which I think is mypy warning us that the two functions accept different
sets of kwargs. Fair enough!

* Changelog
This commit is contained in:
David Robertson 2022-09-26 13:30:00 +01:00 committed by GitHub
parent ac1a31740b
commit dcdd50e458
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/13905.misc Normal file
View File

@ -0,0 +1 @@
Fix mypy errors with canonicaljson 1.6.3.

9
poetry.lock generated
View File

@ -95,14 +95,15 @@ webencodings = "*"
[[package]] [[package]]
name = "canonicaljson" name = "canonicaljson"
version = "1.6.0" version = "1.6.3"
description = "Canonical JSON" description = "Canonical JSON"
category = "main" category = "main"
optional = false optional = false
python-versions = "~=3.7" python-versions = ">=3.7"
[package.dependencies] [package.dependencies]
simplejson = ">=3.14.0" simplejson = ">=3.14.0"
typing-extensions = {version = ">=4.0.0", markers = "python_version < \"3.8\""}
[package.extras] [package.extras]
frozendict = ["frozendict (>=1.0)"] frozendict = ["frozendict (>=1.0)"]
@ -1682,8 +1683,8 @@ bleach = [
{file = "bleach-4.1.0.tar.gz", hash = "sha256:0900d8b37eba61a802ee40ac0061f8c2b5dee29c1927dd1d233e075ebf5a71da"}, {file = "bleach-4.1.0.tar.gz", hash = "sha256:0900d8b37eba61a802ee40ac0061f8c2b5dee29c1927dd1d233e075ebf5a71da"},
] ]
canonicaljson = [ canonicaljson = [
{file = "canonicaljson-1.6.0-py3-none-any.whl", hash = "sha256:7230c2a2a3db07874f622af84effe41a655e07bf23734830e18a454e65d5b998"}, {file = "canonicaljson-1.6.3-py3-none-any.whl", hash = "sha256:6ba3cf1702fa3d209b3e915a4e9a3e4ef194f1e8fca189c1f0b7a2a7686a27e6"},
{file = "canonicaljson-1.6.0.tar.gz", hash = "sha256:8739d5fd91aca7281d425660ae65af7663808c8177778965f67e90b16a2b2427"}, {file = "canonicaljson-1.6.3.tar.gz", hash = "sha256:ca59760bc274a899a0da75809d6909ae43e5123381fd6ef040a44d1952c0b448"},
] ]
certifi = [ certifi = [
{file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"}, {file = "certifi-2021.10.8-py2.py3-none-any.whl", hash = "sha256:d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569"},

4
synapse/http/server.py
View File

@ -705,7 +705,7 @@ class _ByteProducer:
self._request = None self._request = None
def _encode_json_bytes(json_object: Any) -> bytes: def _encode_json_bytes(json_object: object) -> bytes:
""" """
Encode an object into JSON. Returns an iterator of bytes. Encode an object into JSON. Returns an iterator of bytes.
""" """
@ -746,7 +746,7 @@ def respond_with_json(
return None return None
if canonical_json: if canonical_json:
encoder = encode_canonical_json encoder: Callable[[object], bytes] = encode_canonical_json
else: else:
encoder = _encode_json_bytes encoder = _encode_json_bytes