Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-11 14:30:08 -04:00
Code Issues Projects Releases Packages Wiki Activity

Replace all remaining six usage with native Python 3 equivalents (#7704)

Browse source
This commit is contained in:
Dagfinn Ilmari Mannsåker 2020-06-16 13:51:47 +01:00 • committed by GitHub
parent 98c4e35e3c
commit a3f11567d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
73 changed files with 111 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/rest/media/v1/media_storage.py
View file

@ -17,9 +17,6 @@ import contextlib
import logging
import os
import shutil
import sys
import six
from twisted.internet import defer
from twisted.protocols.basic import FileSender
@ -117,12 +114,11 @@ class MediaStorage(object):
with open(fname, "wb") as f:
yield f, fname, finish
except Exception:
t, v, tb = sys.exc_info()
try:
os.remove(fname)
except Exception:
pass
six.reraise(t, v, tb)
raise
if not finished_called:
raise Exception("Finished callback not called")