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

zerver/lib/actions.py: Use text_type in truncate_ functions. 

The functions truncate_content, truncate_body and truncate_topic
are only meant to be used on text strings.  So change its
parameter types from AnyStr to text_type.
This commit is contained in:
Eklavya Sharma 2016-07-05 03:20:24 +05:30 committed by Tim Abbott
parent 976858f536
commit 628e45defc
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/run-mypy
View File

@ -40,7 +40,6 @@ zerver/tests/test_narrow.py
exclude_py2 = [] exclude_py2 = []
exclude_py3 = """ exclude_py3 = """
zerver/lib/actions.py
zerver/lib/ccache.py zerver/lib/ccache.py
zerver/management/commands/create_stream.py zerver/management/commands/create_stream.py
zerver/management/commands/email-mirror.py zerver/management/commands/email-mirror.py

6
zerver/lib/actions.py
View File

@ -2313,17 +2313,17 @@ def subscribed_to_stream(user_profile, stream):
return False return False
def truncate_content(content, max_length, truncation_message): def truncate_content(content, max_length, truncation_message):
# type: (AnyStr, int, AnyStr) -> AnyStr # type: (text_type, int, text_type) -> text_type
if len(content) > max_length: if len(content) > max_length:
content = content[:max_length - len(truncation_message)] + truncation_message content = content[:max_length - len(truncation_message)] + truncation_message
return content return content
def truncate_body(body): def truncate_body(body):
# type: (AnyStr) -> AnyStr # type: (text_type) -> text_type
return truncate_content(body, MAX_MESSAGE_LENGTH, "...") return truncate_content(body, MAX_MESSAGE_LENGTH, "...")
def truncate_topic(topic): def truncate_topic(topic):
# type: (AnyStr) -> AnyStr # type: (text_type) -> text_type
return truncate_content(topic, MAX_SUBJECT_LENGTH, "...") return truncate_content(topic, MAX_SUBJECT_LENGTH, "...")