Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

zthumbor: Fix thumbor behaviour when using it with s3 storage.

This commit is contained in:
Aditya Bansal 2018-09-01 17:45:02 +05:30 committed by Tim Abbott
parent 8324e2c976
commit 436bcd121b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zthumbor/loaders/zloader.py
View File

@ -35,6 +35,11 @@ def load(context, url, callback):
return
if source_type == THUMBOR_S3_TYPE:
if actual_url.startswith('/user_uploads/'): # type: ignore # python 2 type differs from python 3 type
actual_url = actual_url[len('/user_uploads/'):]
else:
raise AssertionError("Unexpected s3 file.")
s3_loader.load(context, actual_url, callback)
elif source_type == THUMBOR_LOCAL_FILE_TYPE:
if actual_url.startswith('/user_uploads/'): # type: ignore # python 2 type differs from python 3 type