summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-11 10:35:13 +0000
committerErik Johnston <erik@matrix.org>2015-02-11 10:35:13 +0000
commit5758dafb4e8c28ed3a19b352798bac7e3ff619e3 (patch)
treef6427195438c7e1e076ee4a0124f403a5ad26b1a /synapse/crypto
parentMerge branch 'develop' of github.com:matrix-org/synapse into state-chache (diff)
parentFix bug where variable was not always defined (diff)
downloadsynapse-5758dafb4e8c28ed3a19b352798bac7e3ff619e3.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
Diffstat (limited to 'synapse/crypto')
-rw-r--r--synapse/crypto/keyclient.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/crypto/keyclient.py b/synapse/crypto/keyclient.py
index cdb6279764..cd12349f67 100644
--- a/synapse/crypto/keyclient.py
+++ b/synapse/crypto/keyclient.py
@@ -75,7 +75,7 @@ class SynapseKeyClientProtocol(HTTPClient):
 
     def handleStatus(self, version, status, message):
         if status != b"200":
-            #logger.info("Non-200 response from %s: %s %s",
+            # logger.info("Non-200 response from %s: %s %s",
             #            self.transport.getHost(), status, message)
             self.transport.abortConnection()
 
@@ -83,7 +83,7 @@ class SynapseKeyClientProtocol(HTTPClient):
         try:
             json_response = json.loads(response_body_bytes)
         except ValueError:
-            #logger.info("Invalid JSON response from %s",
+            # logger.info("Invalid JSON response from %s",
             #            self.transport.getHost())
             self.transport.abortConnection()
             return