summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan de Jong <jonathan@automatia.nl>2021-03-29 15:40:45 +0200
committerGitHub <noreply@github.com>2021-03-29 09:40:45 -0400
commitfc53a606e4ee7d94e2fadfb00d19b7e8e21699ad (patch)
tree99598092d2b064db406d5c1ad5ce575ba4862f4a
parentFix the suggested pip incantation for cryptography (#9699) (diff)
downloadsynapse-fc53a606e4ee7d94e2fadfb00d19b7e8e21699ad.tar.xz
Fix `re.Pattern` mypy error on 3.6 (#9703)
Diffstat (limited to '')
-rw-r--r--changelog.d/9703.misc1
-rw-r--r--synapse/logging/opentracing.py4
2 files changed, 3 insertions, 2 deletions
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