diff options
| author | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-08-25 17:19:06 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <dawagner@gmail.com> | 2015-08-25 17:19:06 +0100 |
| commit | ee3fa1a99c4a5436804bb6ada0b0ac18db9e1d1b (patch) | |
| tree | 710bc81019543d7c2fd9eabc6dfd45680b4efcfd /synapse/rest/media | |
| parent | Merge pull request #247 from matrix-org/markjh/tox (diff) | |
| parent | Fix up one more reference (diff) | |
| download | synapse-ee3fa1a99c4a5436804bb6ada0b0ac18db9e1d1b.tar.xz | |
Merge pull request #248 from matrix-org/deviceid
Remove completely unused concepts from codebase
Diffstat (limited to 'synapse/rest/media')
| -rw-r--r-- | synapse/rest/media/v0/content_repository.py | 2 | ||||
| -rw-r--r-- | synapse/rest/media/v1/upload_resource.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/media/v0/content_repository.py b/synapse/rest/media/v0/content_repository.py index e77a20fb2e..c28dc86cd7 100644 --- a/synapse/rest/media/v0/content_repository.py +++ b/synapse/rest/media/v0/content_repository.py @@ -66,7 +66,7 @@ class ContentRepoResource(resource.Resource): @defer.inlineCallbacks def map_request_to_name(self, request): # auth the user - auth_user, client = yield self.auth.get_user_by_req(request) + auth_user, _ = yield self.auth.get_user_by_req(request) # namespace all file uploads on the user prefix = base64.urlsafe_b64encode( diff --git a/synapse/rest/media/v1/upload_resource.py b/synapse/rest/media/v1/upload_resource.py index cdd1d44e07..439d5a30a8 100644 --- a/synapse/rest/media/v1/upload_resource.py +++ b/synapse/rest/media/v1/upload_resource.py @@ -70,7 +70,7 @@ class UploadResource(BaseMediaResource): @request_handler @defer.inlineCallbacks def _async_render_POST(self, request): - auth_user, client = yield self.auth.get_user_by_req(request) + auth_user, _ = yield self.auth.get_user_by_req(request) # TODO: The checks here are a bit late. The content will have # already been uploaded to a tmp file at this point content_length = request.getHeader("Content-Length") |