summary refs log tree commit diff
path: root/synapse/media
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-12-02 19:55:18 +0000
committerMark Haines <mark.haines@matrix.org>2014-12-02 19:55:18 +0000
commit2f804a70723a911bbc1d1bafbeb33f8462980151 (patch)
treecafca71db294c820163d50bef663ef0b8fbb837d /synapse/media
parentGet uploads working with new media repo (diff)
downloadsynapse-2f804a70723a911bbc1d1bafbeb33f8462980151.tar.xz
Fix pyflakes and pep8 warnings
Diffstat (limited to 'synapse/media')
-rw-r--r--synapse/media/v1/media_repository.py3
-rw-r--r--synapse/media/v1/upload_resource.py1
2 files changed, 3 insertions, 1 deletions
diff --git a/synapse/media/v1/media_repository.py b/synapse/media/v1/media_repository.py
index 0f4eeef278..afd92874cf 100644
--- a/synapse/media/v1/media_repository.py
+++ b/synapse/media/v1/media_repository.py
@@ -49,7 +49,8 @@ class MediaRepositoryResource(Resource):
 
     Clients can get thumbnails by supplying a desired width and height::
 
-        => GET /_matrix/media/v1/thumbnail/<media-id>?width=<w>&height=<h> HTTP/1.1
+        => GET /_matrix/media/v1
+                /thumbnail/<media-id>?width=<w>&height=<h> HTTP/1.1
 
         <= HTTP/1.1 200 OK
            Content-Type: image/jpeg or image/png
diff --git a/synapse/media/v1/upload_resource.py b/synapse/media/v1/upload_resource.py
index d9d7825b2b..2919fee12f 100644
--- a/synapse/media/v1/upload_resource.py
+++ b/synapse/media/v1/upload_resource.py
@@ -29,6 +29,7 @@ import logging
 
 logger = logging.getLogger(__name__)
 
+
 class UploadResource(resource.Resource):
 
     def __init__(self, hs, filepaths):