summary refs log tree commit diff
path: root/synapse/http/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-10 18:04:03 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-10 18:04:03 +0100
commitf04e35c17001171df58ace4fed63772d8101d7fc (patch)
tree11424fdd20122c014262283d4401c84ffbcd9978 /synapse/http/server.py
parentMerge branch 'develop' of git+ssh://github.com/matrix-org/synapse into matrix... (diff)
parents/becuase/because/g (diff)
downloadsynapse-f04e35c17001171df58ace4fed63772d8101d7fc.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/http/server.py')
-rw-r--r--synapse/http/server.py38
1 files changed, 19 insertions, 19 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py

index 517aaf7b5a..c70fdbdfd2 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py
@@ -14,33 +14,33 @@ # See the License for the specific language governing permissions and # limitations under the License. import cgi -from six.moves import http_client +import collections +import logging +import urllib -from synapse.api.errors import ( - cs_exception, SynapseError, CodeMessageException, UnrecognizedRequestError, Codes -) -from synapse.http.request_metrics import ( - requests_counter, -) -from synapse.util.logcontext import LoggingContext, PreserveLoggingContext -from synapse.util.caches import intern_dict -from synapse.util.metrics import Measure -import synapse.metrics -import synapse.events +from six.moves import http_client -from canonicaljson import ( - encode_canonical_json, encode_pretty_printed_json, json -) +from canonicaljson import encode_canonical_json, encode_pretty_printed_json, json from twisted.internet import defer from twisted.python import failure -from twisted.web import server, resource +from twisted.web import resource, server from twisted.web.server import NOT_DONE_YET from twisted.web.util import redirectTo -import collections -import logging -import urllib +import synapse.events +import synapse.metrics +from synapse.api.errors import ( + CodeMessageException, + Codes, + SynapseError, + UnrecognizedRequestError, + cs_exception, +) +from synapse.http.request_metrics import requests_counter +from synapse.util.caches import intern_dict +from synapse.util.logcontext import LoggingContext, PreserveLoggingContext +from synapse.util.metrics import Measure logger = logging.getLogger(__name__)