summary refs log tree commit diff
path: root/synapse/rest/media/v1/media_storage.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-01-12 13:32:03 +0000
committerErik Johnston <erik@matrix.org>2018-01-12 13:32:03 +0000
commit85a4d78213f6987c920043532bca428bb582a46b (patch)
tree7e3aa2e41824c75121eafc85c7898007ce1ddaad /synapse/rest/media/v1/media_storage.py
parentAdd missing class var (diff)
downloadsynapse-85a4d78213f6987c920043532bca428bb582a46b.tar.xz
Make Responder a context manager
Diffstat (limited to 'synapse/rest/media/v1/media_storage.py')
-rw-r--r--synapse/rest/media/v1/media_storage.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/rest/media/v1/media_storage.py b/synapse/rest/media/v1/media_storage.py
index 49d2b7cd45..b6e7a19e12 100644
--- a/synapse/rest/media/v1/media_storage.py
+++ b/synapse/rest/media/v1/media_storage.py
@@ -220,8 +220,7 @@ class FileResponder(Responder):
 
     @defer.inlineCallbacks
     def write_to_consumer(self, consumer):
-        with self.open_file:
-            yield FileSender().beginFileTransfer(self.open_file, consumer)
+        yield FileSender().beginFileTransfer(self.open_file, consumer)
 
-    def cancel(self):
+    def __exit__(self, exc_type, exc_val, exc_tb):
         self.open_file.close()