summary refs log tree commit diff
path: root/synapse/crypto
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-02-10 18:13:25 +0000
committerMark Haines <mark.haines@matrix.org>2015-02-10 18:13:25 +0000
commit5e543652340c5085187db3833c5855d6f3b2eff0 (patch)
tree44610ce67c08606df99e3c6c2898f0c77eecfd02 /synapse/crypto
parentAdd the 'setup_requires' and allow easy_install since jenkins uses them (diff)
parentFix code-style (diff)
downloadsynapse-5e543652340c5085187db3833c5855d6f3b2eff0.tar.xz
Merge branch 'develop' into single_source_version_and_dependencies
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