From 3158ed01bf03c193ecd6c695da9968810d902a34 Mon Sep 17 00:00:00 2001 From: Steve Howell Date: Sat, 4 Nov 2017 12:01:46 -0700 Subject: [PATCH] Remove force_str() in upload.py. --- zerver/lib/upload.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zerver/lib/upload.py b/zerver/lib/upload.py index c329eab137..b08d5921e3 100644 --- a/zerver/lib/upload.py +++ b/zerver/lib/upload.py @@ -186,7 +186,7 @@ def upload_image_to_s3( conn = S3Connection(settings.S3_KEY, settings.S3_SECRET_KEY) bucket = get_bucket(conn, bucket_name) key = Key(bucket) - key.key = force_str(file_name) + key.key = file_name key.set_metadata("user_profile_id", str(user_profile.id)) key.set_metadata("realm_id", str(user_profile.realm_id)) @@ -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 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=path) def get_realm_for_filename(path): # type: (Text) -> Optional[int]