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

zerver/lib: Remove u prefix from strings.

Browse Source 
License: Apache-2.0
Signed-off-by: rht <rhtbot@protonmail.com>
This commit is contained in:
rht
2017-11-03 03:12:25 +01:00
committed by Tim Abbott
parent 5d04e29ac2
commit fef7d6ba09
18 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/lib/upload.py
View File

@@ -52,13 +52,13 @@ DEFAULT_EMOJI_SIZE = 64
# "file name" is the original filename provided by the user run
# through a sanitization function.
attachment_url_re = re.compile(u'[/\-]user[\-_]uploads[/\.-].*?(?=[ )]|\Z)')
attachment_url_re = re.compile('[/\-]user[\-_]uploads[/\.-].*?(?=[ )]|\Z)')
def attachment_url_to_path_id(attachment_url):
# type: (Text) -> Text
path_id_raw = re.sub(u'[/\-]user[\-_]uploads[/\.-]', u'', attachment_url)
path_id_raw = re.sub('[/\-]user[\-_]uploads[/\.-]', '', attachment_url)
# Remove any extra '.' after file extension. These are probably added by the user
return re.sub(u'[.]+$', u'', path_id_raw, re.M)
return re.sub('[.]+$', '', path_id_raw, re.M)
def sanitize_name(raw_value):
# type: (NonBinaryStr) -> Text
@@ -194,7 +194,7 @@ def upload_image_to_s3(
key.set_metadata("realm_id", str(user_profile.realm_id))
if content_type is not None:
headers = {u'Content-Type': content_type} # type: Optional[Dict[Text, Text]]
headers = {'Content-Type': content_type} # type: Optional[Dict[Text, Text]]
else:
headers = None