3 files changed, 4 insertions, 5 deletions
diff --git a/changelog.d/11817.misc b/changelog.d/11817.misc
index bd29d8d6eb..3d6b2ea4d4 100644
--- a/changelog.d/11817.misc
+++ b/changelog.d/11817.misc
@@ -1 +1 @@
-Compatibility with updated type hints for jsonschema 4.4.0.
+Correct a type annotation in the event validation logic.
diff --git a/changelog.d/11830.misc b/changelog.d/11830.misc
new file mode 100644
index 0000000000..fe248d00ab
--- /dev/null
+++ b/changelog.d/11830.misc
@@ -0,0 +1 @@
+Correct a type annotation in the event validation logic.
\ No newline at end of file
diff --git a/synapse/events/validator.py b/synapse/events/validator.py
index 4245573017..360d24274a 100644
--- a/synapse/events/validator.py
+++ b/synapse/events/validator.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import collections.abc
-from typing import Iterable, Union
+from typing import Iterable, Type, Union
import jsonschema
@@ -246,9 +246,7 @@ POWER_LEVELS_SCHEMA = {
# This could return something newer than Draft 7, but that's the current "latest"
# validator.
-#
-# See https://github.com/python/typeshed/issues/7028 for the ignored return type.
-def _create_power_level_validator() -> jsonschema.Draft7Validator: # type: ignore[valid-type]
+def _create_power_level_validator() -> Type[jsonschema.Draft7Validator]:
validator = jsonschema.validators.validator_for(POWER_LEVELS_SCHEMA)
# by default jsonschema does not consider a frozendict to be an object so
|