Skip to content

Commit c5e5a00

Browse files
fix: fill in tzinfo for datetime.fromtimestamp() calls
Unix timestamp is defined to be UTC and fromtimetamp correctly turns it into whatever timezone you request. In most cases, just need to specify *something* to avoid creating naive datetimes.
1 parent ca1320f commit c5e5a00

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

bin/add-old-drafts-from-archive.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
print name, rev, "Can't parse", p,":",e
6767
continue
6868
if draft.errors and draft.errors.keys()!=['draftname',]:
69-
print "Errors - could not process", name, rev, datetime.datetime.fromtimestamp(p.stat().st_mtime), draft.errors, draft.get_title().encode('utf8')
69+
print "Errors - could not process", name, rev, datetime.datetime.fromtimestamp(p.stat().st_mtime, datetime.timezone.utc), draft.errors, draft.get_title().encode('utf8')
7070
else:
71-
time = datetime.datetime.fromtimestamp(p.stat().st_mtime)
71+
time = datetime.datetime.fromtimestamp(p.stat().st_mtime, datetime.timezone.utc)
7272
if not doc:
7373
doc = Document.objects.create(name=name,
7474
time=time,

ietf/doc/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ def fake_history_obj(self, rev):
962962
elif rev_events.exists():
963963
time = rev_events.first().time
964964
else:
965-
time = datetime.datetime.fromtimestamp(0)
965+
time = datetime.datetime.fromtimestamp(0, datetime.timezone.utc)
966966
dh = DocHistory(name=self.name, rev=rev, doc=self, time=time, type=self.type, title=self.title,
967967
stream=self.stream, group=self.group)
968968

ietf/review/mailarch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def retrieve_messages_from_mbox(mbox_fileobj):
8989
utcdate = None
9090
d = email.utils.parsedate_tz(msg["Date"])
9191
if d:
92-
utcdate = datetime.datetime.fromtimestamp(email.utils.mktime_tz(d))
92+
utcdate = datetime.datetime.fromtimestamp(email.utils.mktime_tz(d), datetime.timezone.utc)
9393

9494
res.append({
9595
"from": msg["From"],

ietf/secr/proceedings/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ def select(request, meeting_num):
304304
# get the time proceedings were generated
305305
path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'index.html')
306306
if os.path.exists(path):
307-
last_run = datetime.datetime.fromtimestamp(os.path.getmtime(path))
307+
last_run = datetime.datetime.fromtimestamp(os.path.getmtime(path), datetime.timezone.utc)
308308
else:
309309
last_run = None
310310

0 commit comments

Comments
 (0)