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

timestamp: Remove datetime_to_precise_timestamp for datetime.timestamp. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2020-07-31 18:20:55 -07:00 committed by Tim Abbott
parent 6ec808b8df
commit 159641bab8
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/lib/timestamp.py
View File

@ -1,6 +1,5 @@
import calendar import calendar
import datetime import datetime
import time
class TimezoneNotUTCException(Exception): class TimezoneNotUTCException(Exception):
@ -41,7 +40,3 @@ def timestamp_to_datetime(timestamp: float) -> datetime.datetime:
def datetime_to_timestamp(dt: datetime.datetime) -> int: def datetime_to_timestamp(dt: datetime.datetime) -> int:
verify_UTC(dt) verify_UTC(dt)
return calendar.timegm(dt.timetuple()) return calendar.timegm(dt.timetuple())
def datetime_to_precise_timestamp(dt: datetime.datetime) -> float:
verify_UTC(dt)
return time.mktime(dt.timetuple()) + dt.microsecond/1000000

4
zerver/models.py
View File

@ -66,7 +66,7 @@ from zerver.lib.cache import (
) )
from zerver.lib.exceptions import JsonableError from zerver.lib.exceptions import JsonableError
from zerver.lib.pysa import mark_sanitized from zerver.lib.pysa import mark_sanitized
from zerver.lib.timestamp import datetime_to_precise_timestamp, datetime_to_timestamp from zerver.lib.timestamp import datetime_to_timestamp
from zerver.lib.types import ( from zerver.lib.types import (
DisplayRecipientT, DisplayRecipientT,
ExtendedFieldElement, ExtendedFieldElement,
@ -1934,7 +1934,7 @@ class Draft(models.Model):
"to": to, "to": to,
"topic": self.topic, "topic": self.topic,
"content": self.content, "content": self.content,
"timestamp": datetime_to_precise_timestamp(self.last_edit_time), "timestamp": self.last_edit_time.timestamp(),
} }
class AbstractReaction(models.Model): class AbstractReaction(models.Model):

8
zerver/tests/test_timestamp.py
View File

@ -1,4 +1,3 @@
import time
from datetime import timedelta, timezone from datetime import timedelta, timezone
from dateutil import parser from dateutil import parser
@ -8,7 +7,6 @@ from zerver.lib.timestamp import (
TimezoneNotUTCException, TimezoneNotUTCException,
ceiling_to_hour, ceiling_to_hour,
convert_to_UTC, convert_to_UTC,
datetime_to_precise_timestamp,
datetime_to_timestamp, datetime_to_timestamp,
floor_to_day, floor_to_day,
floor_to_hour, floor_to_hour,
@ -44,9 +42,3 @@ class TestTimestamp(ZulipTestCase):
for function in [floor_to_hour, floor_to_day, ceiling_to_hour, ceiling_to_hour]: for function in [floor_to_hour, floor_to_day, ceiling_to_hour, ceiling_to_hour]:
with self.assertRaises(TimezoneNotUTCException): with self.assertRaises(TimezoneNotUTCException):
function(non_utc_datetime) function(non_utc_datetime)
def test_datetime_to_precise_timestamp(self) -> None:
timestamp = round(time.time(), 6)
dt = timestamp_to_datetime(timestamp)
post_conversion_timestamp = datetime_to_precise_timestamp(dt)
self.assertEqual(timestamp, post_conversion_timestamp)