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

ruff: Fix DTZ001 datetime.datetime() without tzinfo argument.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2022-12-25 15:34:36 -08:00
committed by Tim Abbott
parent 1451dbffb9
commit 7216ba4813
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/export.py
View File

@@ -30,7 +30,6 @@ from scripts.lib.zulip_tools import overwrite_symlink
from zerver.lib.avatar_hash import user_avatar_path_from_ids from zerver.lib.avatar_hash import user_avatar_path_from_ids
from zerver.lib.pysa import mark_sanitized from zerver.lib.pysa import mark_sanitized
from zerver.lib.upload import get_bucket from zerver.lib.upload import get_bucket
from zerver.lib.utils import assert_is_not_none
from zerver.models import ( from zerver.models import (
AlertWord, AlertWord,
Attachment, Attachment,
@@ -434,8 +433,7 @@ def floatify_datetime_fields(data: TableData, table: TableName) -> None:
continue continue
assert isinstance(dt, datetime.datetime) assert isinstance(dt, datetime.datetime)
assert not timezone_is_naive(dt) assert not timezone_is_naive(dt)
utc_naive = dt.replace(tzinfo=None) - assert_is_not_none(dt.utcoffset()) item[field] = dt.timestamp()
item[field] = (utc_naive - datetime.datetime(1970, 1, 1)).total_seconds()
def listify_bithandler_fields(data: TableData, table: TableName) -> None: def listify_bithandler_fields(data: TableData, table: TableName) -> None:

7
zerver/tests/test_timezone.py
View File

@@ -1,5 +1,5 @@
import sys import sys
from datetime import datetime from datetime import datetime, timezone
from django.utils.timezone import now as timezone_now from django.utils.timezone import now as timezone_now
@@ -35,7 +35,10 @@ class TimeZoneTest(ZulipTestCase):
assert not missing, missing assert not missing, missing
now = timezone_now() now = timezone_now()
dates = [datetime(now.year, 6, 21), datetime(now.year, 12, 21)] dates = [
datetime(now.year, 6, 21, tzinfo=timezone.utc),
datetime(now.year, 12, 21, tzinfo=timezone.utc),
]
extra = {*common_timezones.items(), *ambiguous_abbrevs} extra = {*common_timezones.items(), *ambiguous_abbrevs}
for name in zoneinfo.available_timezones(): for name in zoneinfo.available_timezones():
tz = zoneinfo.ZoneInfo(name) tz = zoneinfo.ZoneInfo(name)