diff --git a/synapse/http/__init__.py b/synapse/http/__init__.py
index 9bff9ec169..f9811bfa04 100644
--- a/synapse/http/__init__.py
+++ b/synapse/http/__init__.py
@@ -12,4 +12,3 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-
diff --git a/synapse/http/client.py b/synapse/http/client.py
index 8bda42364b..29e6053bc1 100644
--- a/synapse/http/client.py
+++ b/synapse/http/client.py
@@ -100,7 +100,7 @@ class BaseHttpClient(object):
retries_left = 5
- endpoint = self._getEndpoint(reactor, destination);
+ endpoint = self._getEndpoint(reactor, destination)
while True:
@@ -185,7 +185,7 @@ class MatrixHttpClient(BaseHttpClient):
auth_headers = []
- for key,sig in request["signatures"][self.server_name].items():
+ for key, sig in request["signatures"][self.server_name].items():
auth_headers.append(bytes(
"X-Matrix origin=%s,key=\"%s\",sig=\"%s\"" % (
self.server_name, key, sig,
@@ -280,7 +280,6 @@ class MatrixHttpClient(BaseHttpClient):
defer.returnValue(json.loads(body))
-
def _getEndpoint(self, reactor, destination):
return matrix_endpoint(
reactor, destination, timeout=10,
@@ -355,6 +354,7 @@ class IdentityServerHttpClient(BaseHttpClient):
defer.returnValue(json.loads(body))
+
class CaptchaServerHttpClient(MatrixHttpClient):
"""Separate HTTP client for talking to google's captcha servers"""
@@ -388,6 +388,7 @@ class CaptchaServerHttpClient(MatrixHttpClient):
else:
raise e
+
def _print_ex(e):
if hasattr(e, "reasons") and e.reasons:
for ex in e.reasons:
diff --git a/synapse/http/content_repository.py b/synapse/http/content_repository.py
index 7dd4a859f8..3159ffff0a 100644
--- a/synapse/http/content_repository.py
+++ b/synapse/http/content_repository.py
@@ -38,8 +38,8 @@ class ContentRepoResource(resource.Resource):
Uploads are POSTed to wherever this Resource is linked to. This resource
returns a "content token" which can be used to GET this content again. The
- token is typically a path, but it may not be. Tokens can expire, be one-time
- uses, etc.
+ token is typically a path, but it may not be. Tokens can expire, be
+ one-time uses, etc.
In this case, the token is a path to the file and contains 3 interesting
sections:
@@ -175,10 +175,9 @@ class ContentRepoResource(resource.Resource):
with open(fname, "wb") as f:
f.write(request.content.read())
-
# FIXME (erikj): These should use constants.
file_name = os.path.basename(fname)
- # FIXME: we can't assume what the public mounted path of the repo is
+ # FIXME: we can't assume what the repo's public mounted path is
# ...plus self-signed SSL won't work to remote clients anyway
# ...and we can't assume that it's SSL anyway, as we might want to
# server it via the non-SSL listener...
@@ -201,6 +200,3 @@ class ContentRepoResource(resource.Resource):
500,
json.dumps({"error": "Internal server error"}),
send_cors=True)
-
-
-
|
