diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-10-30 11:10:17 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-10-30 11:10:17 +0000 |
commit | 7d709542ca3ae3c69a46f3d9dc383cf9c4dfab95 (patch) | |
tree | 155997683ee2d493e53218a725eb2b85b526fbe9 /synapse/http/content_repository.py | |
parent | SYWEB-112: Use the right user ID when determining invites for display on the ... (diff) | |
download | synapse-7d709542ca3ae3c69a46f3d9dc383cf9c4dfab95.tar.xz |
Fix pep8 warnings
Diffstat (limited to 'synapse/http/content_repository.py')
-rw-r--r-- | synapse/http/content_repository.py | 10 |
1 files changed, 3 insertions, 7 deletions
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) - - - |