From b8ad756bd0d7c42c7c241fa08f5e078561fddded Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 7 Sep 2018 14:20:54 +0100
Subject: [PATCH 1/2] Fix jwt import check

This handy code attempted to check that we could import jwt, but utterly failed
to check it was the right jwt.

Fixes https://github.com/matrix-org/synapse/issues/3793
---
 synapse/config/homeserver.py             | 2 +-
 synapse/config/{jwt.py => jwt_config.py} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename synapse/config/{jwt.py => jwt_config.py} (100%)

diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py
index 2fd9c48ab..b8d5690f2 100644
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -21,7 +21,7 @@ from .consent_config import ConsentConfig
 from .database import DatabaseConfig
 from .emailconfig import EmailConfig
 from .groups import GroupsConfig
-from .jwt import JWTConfig
+from .jwt_config import JWTConfig
 from .key import KeyConfig
 from .logger import LoggingConfig
 from .metrics import MetricsConfig
diff --git a/synapse/config/jwt.py b/synapse/config/jwt_config.py
similarity index 100%
rename from synapse/config/jwt.py
rename to synapse/config/jwt_config.py

From edda9f5cac2b25386c42c6eabf2e5a7dae159986 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 7 Sep 2018 14:23:35 +0100
Subject: [PATCH 2/2] changelog

---
 changelog.d/3824.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/3824.bugfix

diff --git a/changelog.d/3824.bugfix b/changelog.d/3824.bugfix
new file mode 100644
index 000000000..99f199dcc
--- /dev/null
+++ b/changelog.d/3824.bugfix
@@ -0,0 +1 @@
+Fix jwt import check
\ No newline at end of file