paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 21:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove force_text() in get_signed_upload_url().

Browse Source
This commit is contained in:
Steve Howell
2017-11-04 11:12:46 -07:00
committed by Tim Abbott
parent 7da6beac99
commit b0bb09cdb8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/upload.py
View File

@@ -11,7 +11,7 @@ import unicodedata
from zerver.lib.avatar_hash import user_avatar_path
from zerver.lib.exceptions import JsonableError, ErrorCode
from zerver.lib.str_utils import force_text, force_str, NonBinaryStr
from zerver.lib.str_utils import force_str, NonBinaryStr
from boto.s3.bucket import Bucket
from boto.s3.key import Key
@@ -240,7 +240,7 @@ def get_file_info(request, user_file):
def get_signed_upload_url(path):
# type: (Text) -> Text
conn = S3Connection(settings.S3_KEY, settings.S3_SECRET_KEY)
return force_text(conn.generate_url(15, 'GET', bucket=settings.S3_AUTH_UPLOADS_BUCKET, key=force_str(path)))
return conn.generate_url(15, 'GET', bucket=settings.S3_AUTH_UPLOADS_BUCKET, key=force_str(path))
def get_realm_for_filename(path):
# type: (Text) -> Optional[int]