summary refs log tree commit diff
path: root/synapse/http/site.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-07-17 13:41:59 +1000
committerGitHub <noreply@github.com>2018-07-17 13:41:59 +1000
commitfe10dd9fb220ef5c0ee7c6e33e2e6dff56a84f06 (patch)
treecc6bec924e11bcc49d0f6491a5699a3624c0014d /synapse/http/site.py
parentFix develop because I broke it :( (#3535) (diff)
parentrename 'isort' to 'check_isort' as requested (diff)
downloadsynapse-fe10dd9fb220ef5c0ee7c6e33e2e6dff56a84f06.tar.xz
Merge pull request #3540 from krombel/enforce_isort
check isort by travis
Diffstat (limited to 'synapse/http/site.py')
-rw-r--r--synapse/http/site.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/site.py b/synapse/http/site.py
index 21e26f9c5e..41dd974cea 100644
--- a/synapse/http/site.py
+++ b/synapse/http/site.py
@@ -20,7 +20,7 @@ from twisted.web.server import Request, Site
 
 from synapse.http import redact_uri
 from synapse.http.request_metrics import RequestMetrics
-from synapse.util.logcontext import LoggingContext, ContextResourceUsage
+from synapse.util.logcontext import ContextResourceUsage, LoggingContext
 
 logger = logging.getLogger(__name__)