diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-02-10 18:13:25 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-02-10 18:13:25 +0000 |
| commit | 5e543652340c5085187db3833c5855d6f3b2eff0 (patch) | |
| tree | 44610ce67c08606df99e3c6c2898f0c77eecfd02 /synapse/rest | |
| parent | Add the 'setup_requires' and allow easy_install since jenkins uses them (diff) | |
| parent | Fix code-style (diff) | |
| download | synapse-5e543652340c5085187db3833c5855d6f3b2eff0.tar.xz | |
Merge branch 'develop' into single_source_version_and_dependencies
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v1/directory.py | 2 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/sync.py | 2 | ||||
| -rw-r--r-- | synapse/rest/media/v1/upload_resource.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/synapse/rest/client/v1/directory.py b/synapse/rest/client/v1/directory.py index 8f65efec5f..8ed7e2d669 100644 --- a/synapse/rest/client/v1/directory.py +++ b/synapse/rest/client/v1/directory.py @@ -48,7 +48,7 @@ class ClientDirectoryServer(ClientV1RestServlet): user, client = yield self.auth.get_user_by_req(request) content = _parse_json(request) - if not "room_id" in content: + if "room_id" not in content: raise SynapseError(400, "Missing room_id key", errcode=Codes.BAD_JSON) diff --git a/synapse/rest/client/v2_alpha/sync.py b/synapse/rest/client/v2_alpha/sync.py index 81d5cf8ead..3056ec45cf 100644 --- a/synapse/rest/client/v2_alpha/sync.py +++ b/synapse/rest/client/v2_alpha/sync.py @@ -118,7 +118,7 @@ class SyncRestServlet(RestServlet): except: filter = Filter({}) # filter = filter.apply_overrides(http_request) - #if filter.matches(event): + # if filter.matches(event): # # stuff sync_config = SyncConfig( diff --git a/synapse/rest/media/v1/upload_resource.py b/synapse/rest/media/v1/upload_resource.py index 6df52ca434..e5aba3af4c 100644 --- a/synapse/rest/media/v1/upload_resource.py +++ b/synapse/rest/media/v1/upload_resource.py @@ -96,8 +96,8 @@ class UploadResource(BaseMediaResource): code=400, ) - #if headers.hasHeader("Content-Disposition"): - # disposition = headers.getRawHeaders("Content-Disposition")[0] + # if headers.hasHeader("Content-Disposition"): + # disposition = headers.getRawHeaders("Content-Disposition")[0] # TODO(markjh): parse content-dispostion content_uri = yield self.create_content( |