summary refs log tree commit diff
path: root/synapse/http/client.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-08-25 10:52:16 +0100
committerMark Haines <mjark@negativecurvature.net>2015-08-25 10:52:16 +0100
commit1c847af28a745434f0707188bc364d90eca5db81 (patch)
tree23b5b0a59283552b9f07e3b240d68fb221a2c965 /synapse/http/client.py
parentMerge pull request #244 from matrix-org/markjh/refresh_tokens (diff)
parentFix typo in module imports and package dependencies (diff)
downloadsynapse-1c847af28a745434f0707188bc364d90eca5db81.tar.xz
Merge pull request #243 from matrix-org/markjh/remove_syutil
Replace syutil dependency with smaller, single-purpose libraries
Diffstat (limited to 'synapse/http/client.py')
-rw-r--r--synapse/http/client.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/http/client.py b/synapse/http/client.py

index 49737d55da..4b8fd3d3a3 100644 --- a/synapse/http/client.py +++ b/synapse/http/client.py
@@ -15,9 +15,10 @@ from synapse.api.errors import CodeMessageException from synapse.util.logcontext import preserve_context_over_fn -from syutil.jsonutil import encode_canonical_json import synapse.metrics +from canonicaljson import encode_canonical_json + from twisted.internet import defer, reactor from twisted.web.client import ( Agent, readBody, FileBodyProducer, PartialDownloadError,