summary refs log tree commit diff
path: root/synapse/rest/media/v1/upload_resource.py
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/rest/media/v1/upload_resource.py
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/rest/media/v1/upload_resource.py')
-rw-r--r--synapse/rest/media/v1/upload_resource.py4
1 files changed, 2 insertions, 2 deletions
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(