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

Fix text_type->Type mypy merge conflict error.

This commit is contained in:
Tim Abbott 2016-12-29 15:03:37 -08:00
parent 9e5325a164
commit 0847515203
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zerver/decorator.py
View File

@ -533,7 +533,7 @@ def flexible_boolean(boolean):
return False return False
def to_utc_datetime(timestamp): def to_utc_datetime(timestamp):
# type: (text_type) -> datetime.datetime # type: (Text) -> datetime.datetime
return timestamp_to_datetime(float(timestamp)) return timestamp_to_datetime(float(timestamp))
def statsd_increment(counter, val=1): def statsd_increment(counter, val=1):