summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2016-07-26 16:57:53 +0100
committerGitHub <noreply@github.com>2016-07-26 16:57:53 +0100
commit2452611d0f0163e7b9c531b48fce11a6dc7e1537 (patch)
treed2067b5f2fbfcc69f7303c3fa567082a5d9469b6 /synapse/rest/client/v2_alpha
parentFix typo (diff)
parentAdd `create_requester` function (diff)
downloadsynapse-2452611d0f0163e7b9c531b48fce11a6dc7e1537.tar.xz
Merge pull request #953 from matrix-org/rav/requester
Add `create_requester` function
Diffstat (limited to 'synapse/rest/client/v2_alpha')
-rw-r--r--synapse/rest/client/v2_alpha/keys.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/synapse/rest/client/v2_alpha/keys.py b/synapse/rest/client/v2_alpha/keys.py
index 89ab39491c..56364af337 100644
--- a/synapse/rest/client/v2_alpha/keys.py
+++ b/synapse/rest/client/v2_alpha/keys.py
@@ -13,18 +13,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import logging
+
+import simplejson as json
+from canonicaljson import encode_canonical_json
 from twisted.internet import defer
 
 from synapse.http.servlet import RestServlet, parse_json_object_from_request
 from synapse.types import UserID
-
-from canonicaljson import encode_canonical_json
-
 from ._base import client_v2_patterns
 
-import logging
-import simplejson as json
-
 logger = logging.getLogger(__name__)