diff options
author | Will Hunt <will@half-shot.uk> | 2020-07-05 16:32:02 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-05 16:32:02 +0100 |
commit | 62b1ce85398f52e7d6137e77083294d0c90af459 (patch) | |
tree | 8bb59226c2abea66fccfd42068a608a88eeaae8c /synapse/config/emailconfig.py | |
parent | Merge different Resource implementation classes (#7732) (diff) | |
download | synapse-62b1ce85398f52e7d6137e77083294d0c90af459.tar.xz |
isort 5 compatibility (#7786)
The CI appears to use the latest version of isort, which is a problem when isort gets a major version bump. Rather than try to pin the version, I've done the necessary to make isort5 happy with synapse.
Diffstat (limited to 'synapse/config/emailconfig.py')
-rw-r--r-- | synapse/config/emailconfig.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/config/emailconfig.py b/synapse/config/emailconfig.py index ca61214454..df08bcd1bc 100644 --- a/synapse/config/emailconfig.py +++ b/synapse/config/emailconfig.py @@ -14,7 +14,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - from __future__ import print_function # This file can't be called email.py because if it is, we cannot: @@ -145,8 +144,8 @@ class EmailConfig(Config): or self.threepid_behaviour_email == ThreepidBehaviour.LOCAL ): # make sure we can import the required deps - import jinja2 import bleach + import jinja2 # prevent unused warnings jinja2 |