Pull in updated canonicaljson lib

so the protocol check just works
matrix-org · Feb 15, 2023 · edab83f · edab83f
1 parent d695914
commit edab83f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/poetry.lock b/poetry.lock
diff --git a/synapse/__init__.py b/synapse/__init__.py
@@ -64,9 +64,7 @@
 try:
     from canonicaljson import set_json_library
 
-    # type-ignore: I think there has been a regression in mypy 1.0.0 in how it checks
-    # modules against Protocols.
-    set_json_library(json)  # type: ignore[arg-type]
+    set_json_library(json)
 except ImportError:
     pass
 

diff --git a/synapse/storage/types.py b/synapse/storage/types.py
@@ -14,6 +14,7 @@
 from types import TracebackType
 from typing import (
     Any,
+    Callable,
     Iterator,
     List,
     Mapping,
@@ -22,7 +23,6 @@
     Tuple,
     Type,
     Union,
-    Callable,
 )
 
 from typing_extensions import Protocol