From b5efcb577e2c9b8b38cb86f87cf65fa93eb2566b Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 26 Mar 2021 16:49:46 +0000 Subject: Make it possible to use dmypy (#9692) Running `dmypy run` will do a `mypy` check while spinning up a daemon that makes rerunning `dmypy run` a lot faster. `dmypy` doesn't support `follow_imports = silent` and has `local_partial_types` enabled, so this PR enables those options and fixes the issues that were newly raised. Note that `local_partial_types` will be enabled by default in upcoming mypy releases. --- synapse/logging/opentracing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'synapse/logging/opentracing.py') diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py index 10bd4a1461..c6e6335740 100644 --- a/synapse/logging/opentracing.py +++ b/synapse/logging/opentracing.py @@ -262,7 +262,7 @@ logger = logging.getLogger(__name__) # Block everything by default # A regex which matches the server_names to expose traces for. # None means 'block everything'. -_homeserver_whitelist = None +_homeserver_whitelist = None # type: Optional[re.Pattern[str]] # Util methods -- cgit 1.5.1 From fc53a606e4ee7d94e2fadfb00d19b7e8e21699ad Mon Sep 17 00:00:00 2001 From: Jonathan de Jong Date: Mon, 29 Mar 2021 15:40:45 +0200 Subject: Fix `re.Pattern` mypy error on 3.6 (#9703) --- changelog.d/9703.misc | 1 + synapse/logging/opentracing.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changelog.d/9703.misc (limited to 'synapse/logging/opentracing.py') diff --git a/changelog.d/9703.misc b/changelog.d/9703.misc new file mode 100644 index 0000000000..8dda739228 --- /dev/null +++ b/changelog.d/9703.misc @@ -0,0 +1 @@ +Fix undetected mypy error when using Python 3.6. \ No newline at end of file diff --git a/synapse/logging/opentracing.py b/synapse/logging/opentracing.py index c6e6335740..aa146e8bb8 100644 --- a/synapse/logging/opentracing.py +++ b/synapse/logging/opentracing.py @@ -169,7 +169,7 @@ import inspect import logging import re from functools import wraps -from typing import TYPE_CHECKING, Dict, Optional, Type +from typing import TYPE_CHECKING, Dict, Optional, Pattern, Type import attr @@ -262,7 +262,7 @@ logger = logging.getLogger(__name__) # Block everything by default # A regex which matches the server_names to expose traces for. # None means 'block everything'. -_homeserver_whitelist = None # type: Optional[re.Pattern[str]] +_homeserver_whitelist = None # type: Optional[Pattern[str]] # Util methods -- cgit 1.5.1