summary refs log tree commit diff
path: root/synapse/config/emailconfig.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-12-13 11:32:53 +0000
committerGitHub <noreply@github.com>2019-12-13 11:32:53 +0000
commit5cadbd9ebb6cc9e6e2e15ab3f77fcbca47d53392 (patch)
tree811fec2b55d1566cc294de5747842d615932b8d4 /synapse/config/emailconfig.py
parentMerge branch 'master' into develop (diff)
parentNewsfile (diff)
downloadsynapse-5cadbd9ebb6cc9e6e2e15ab3f77fcbca47d53392.tar.xz
Merge pull request #6537 from matrix-org/erikj/bump_mypy_version
Bump mypy version
Diffstat (limited to 'synapse/config/emailconfig.py')
-rw-r--r--synapse/config/emailconfig.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py
index 18f42a87f9..35756bed87 100644
--- a/synapse/config/emailconfig.py
+++ b/synapse/config/emailconfig.py
@@ -21,6 +21,7 @@ from __future__ import print_function
 import email.utils
 import os
 from enum import Enum
+from typing import Optional
 
 import pkg_resources
 
@@ -101,7 +102,7 @@ class EmailConfig(Config):
                 # both in RegistrationConfig and here. We should factor this bit out
                 self.account_threepid_delegate_email = self.trusted_third_party_id_servers[
                     0
-                ]
+                ]  # type: Optional[str]
                 self.using_identity_server_from_trusted_list = True
             else:
                 raise ConfigError(