diff --git a/bin/add-old-drafts-from-archive.py b/bin/add-old-drafts-from-archive.py index e169ecdcf..5f7b37783 100755 --- a/bin/add-old-drafts-from-archive.py +++ b/bin/add-old-drafts-from-archive.py @@ -66,9 +66,9 @@ for name in sorted(names): print name, rev, "Can't parse", p,":",e continue if draft.errors and draft.errors.keys()!=['draftname',]: - print "Errors - could not process", name, rev, datetime.datetime.fromtimestamp(p.stat().st_mtime), draft.errors, draft.get_title().encode('utf8') + print "Errors - could not process", name, rev, datetime.datetime.fromtimestamp(p.stat().st_mtime, datetime.timezone.utc), draft.errors, draft.get_title().encode('utf8') else: - time = datetime.datetime.fromtimestamp(p.stat().st_mtime) + time = datetime.datetime.fromtimestamp(p.stat().st_mtime, datetime.timezone.utc) if not doc: doc = Document.objects.create(name=name, time=time, diff --git a/ietf/doc/models.py b/ietf/doc/models.py index 4e2e8836d..56d03adca 100644 --- a/ietf/doc/models.py +++ b/ietf/doc/models.py @@ -962,7 +962,7 @@ class Document(DocumentInfo): elif rev_events.exists(): time = rev_events.first().time else: - time = datetime.datetime.fromtimestamp(0) + time = datetime.datetime.fromtimestamp(0, datetime.timezone.utc) dh = DocHistory(name=self.name, rev=rev, doc=self, time=time, type=self.type, title=self.title, stream=self.stream, group=self.group) diff --git a/ietf/review/mailarch.py b/ietf/review/mailarch.py index 2ca6c9566..c21bc1fc8 100644 --- a/ietf/review/mailarch.py +++ b/ietf/review/mailarch.py @@ -89,7 +89,7 @@ def retrieve_messages_from_mbox(mbox_fileobj): utcdate = None d = email.utils.parsedate_tz(msg["Date"]) if d: - utcdate = datetime.datetime.fromtimestamp(email.utils.mktime_tz(d)) + utcdate = datetime.datetime.fromtimestamp(email.utils.mktime_tz(d), datetime.timezone.utc) res.append({ "from": msg["From"], diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py index b08375176..8189519e9 100644 --- a/ietf/secr/proceedings/views.py +++ b/ietf/secr/proceedings/views.py @@ -304,7 +304,7 @@ def select(request, meeting_num): # get the time proceedings were generated path = os.path.join(settings.SECR_PROCEEDINGS_DIR,meeting.number,'index.html') if os.path.exists(path): - last_run = datetime.datetime.fromtimestamp(os.path.getmtime(path)) + last_run = datetime.datetime.fromtimestamp(os.path.getmtime(path), datetime.timezone.utc) else: last_run = None