Merge pull request ietf-tools#4601 from painless-security/jennifer/yet-more-tz-fixes

fix: more miscellaneous timezone fixes

Author: jennifer-richards

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

@@ -16,6 +16,7 @@
 from django.core.validators import validate_email, ValidationError
 from ietf.utils.draft import PlaintextDraft
 from ietf.submit.utils import update_authors
+from ietf.utils.timezone import date_today
 
 import debug                            # pyflakes:ignore
 
@@ -66,9 +67,9 @@
                     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,
@@ -140,7 +141,7 @@ def turn_into_unicode(s):
                         doc = doc,
                         rev = rev,
                         by = system,
-                        desc = "Revision added from id-archive on %s by %s"%(datetime.date.today(),sys.argv[0]),
+                        desc = "Revision added from id-archive on %s by %s"%(date_today(),sys.argv[0]),
                         time=time,
                 )
                 events.append(e)

bin/check-copyright

@@ -162,7 +162,7 @@ def get_first_commit(path):
             else:
                 pass
     except OSError:
-        rev, who, when = None, None, datetime.datetime.now()
+        rev, who, when = None, None, datetime.datetime.now(datetime.timezone.utc)
     return { path: { 'rev': rev, 'who': who, 'date': when.strftime('%Y-%m-%d %H:%M:%S'), }, }
 
 

ietf/bin/rfc-editor-index-updates

@@ -29,6 +29,7 @@ from django.core.mail import mail_admins
 from ietf.doc.utils import rebuild_reference_relations
 from ietf.utils.log import log
 from ietf.utils.pipe import pipe
+from ietf.utils.timezone import date_today
 
 import ietf.sync.rfceditor
 
@@ -39,7 +40,7 @@ parser.add_option("-d", dest="skip_date",
 
 options, args = parser.parse_args()
 
-skip_date = datetime.date.today() - datetime.timedelta(days=365)
+skip_date = date_today() - datetime.timedelta(days=365)
 if options.skip_date:
     skip_date = datetime.datetime.strptime(options.skip_date, "%Y-%m-%d").date()
 

ietf/bin/send-review-reminders

@@ -26,8 +26,9 @@ from ietf.review.utils import (
     send_unavailability_period_ending_reminder, send_reminder_all_open_reviews,
     send_review_reminder_overdue_assignment, send_reminder_unconfirmed_assignments)
 from ietf.utils.log import log
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
 
-today = datetime.date.today()
+today = date_today(DEADLINE_TZINFO)
 
 for assignment in review_assignments_needing_reviewer_reminder(today):
     email_reviewer_reminder(assignment)

ietf/doc/expire.py

@@ -18,7 +18,7 @@
 from ietf.meeting.models import Meeting
 from ietf.doc.utils import add_state_change_event, update_action_holders
 from ietf.mailtrigger.utils import gather_address_lists
-from ietf.utils.timezone import datetime_today, DEADLINE_TZINFO
+from ietf.utils.timezone import date_today, datetime_today, DEADLINE_TZINFO
 
 
 nonexpirable_states: Optional[List[State]] = None
@@ -173,7 +173,7 @@ def expire_draft(doc):
 
 def clean_up_draft_files():
     """Move unidentified and old files out of the Internet Draft directory."""
-    cut_off = datetime.date.today()
+    cut_off = date_today()
 
     pattern = os.path.join(settings.INTERNET_DRAFT_PATH, "draft-*.*")
     filename_re = re.compile(r'^(.*)-(\d\d)$')

ietf/doc/factories.py

@@ -19,6 +19,7 @@
 from ietf.person.factories import PersonFactory
 from ietf.group.factories import RoleFactory
 from ietf.utils.text import xslugify
+from ietf.utils.timezone import date_today
 
 
 def draft_name_generator(type_id,group,n):
@@ -321,7 +322,7 @@ def states(obj, create, extracted, **kwargs):
 # This is very skeletal. It is enough for the tests that use it now, but when it's needed, it will need to be improved with, at least, a group generator that backs the object with a review team.
 class ReviewFactory(BaseDocumentFactory):
     type_id = 'review'
-    name = factory.LazyAttribute(lambda o: 'review-doesnotexist-00-%s-%s'%(o.group.acronym,datetime.date.today().isoformat()))
+    name = factory.LazyAttribute(lambda o: 'review-doesnotexist-00-%s-%s'%(o.group.acronym,date_today().isoformat()))
     group = factory.SubFactory('ietf.group.factories.GroupFactory',type_id='review')
 
 class DocAliasFactory(factory.django.DjangoModelFactory):

ietf/doc/forms.py

@@ -15,6 +15,7 @@
 from ietf.person.models import Email, Person
 
 from ietf.name.models import ExtResourceName
+from ietf.utils.timezone import date_today
 from ietf.utils.validators import validate_external_resource_value
 
 class TelechatForm(forms.Form):
@@ -34,7 +35,7 @@ def __init__(self, *args, **kwargs):
         for d in dates:
           self.page_count[d] = telechat_page_count(date=d).for_approval
           choice_display[d] = '%s (%s pages)' % (d.strftime("%Y-%m-%d"),self.page_count[d])
-          if d-datetime.date.today() < datetime.timedelta(days=13):
+          if d - date_today() < datetime.timedelta(days=13):
               choice_display[d] += ' : WARNING - this may not leave enough time for directorate reviews!'
         self.fields['telechat_date'].choices = [("", "(not on agenda)")] + [(d, choice_display[d]) for d in dates]
 

ietf/doc/lastcall.py

@@ -1,7 +1,5 @@
 # helpers for handling last calls on Internet Drafts
 
-import datetime
-
 from django.db.models import Q
 
 from ietf.doc.models import Document, State, DocEvent, LastCallDocEvent, WriteupDocEvent
@@ -10,6 +8,8 @@
 from ietf.doc.utils import add_state_change_event, update_action_holders
 from ietf.doc.mails import generate_ballot_writeup, generate_approval_mail, generate_last_call_announcement
 from ietf.doc.mails import send_last_call_request, email_last_call_expired, email_last_call_expired_with_downref
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
+
 
 def request_last_call(request, doc):
     if not doc.latest_event(type="changed_ballot_writeup_text"):
@@ -33,7 +33,7 @@ def request_last_call(request, doc):
     e.save()
 
 def get_expired_last_calls():
-    today = datetime.date.today()
+    today = date_today(DEADLINE_TZINFO)
     for d in Document.objects.filter(Q(states__type="draft-iesg", states__slug="lc")
                                     | Q(states__type="statchg", states__slug="in-lc")):
         e = d.latest_event(LastCallDocEvent, type="sent_last_call")

ietf/doc/mails.py

@@ -25,6 +25,7 @@
 from ietf.group.models import Role
 from ietf.doc.models import Document
 from ietf.mailtrigger.utils import gather_address_lists
+from ietf.utils.timezone import date_today, DEADLINE_TZINFO
 
 
 def email_state_changed(request, doc, text, mailtrigger_id=None):
@@ -192,7 +193,7 @@ def generate_ballot_rfceditornote(request, doc):
     return e
 
 def generate_last_call_announcement(request, doc):
-    expiration_date = datetime.date.today() + datetime.timedelta(days=14)
+    expiration_date = date_today(DEADLINE_TZINFO) + datetime.timedelta(days=14)
     if doc.group.type_id in ("individ", "area"):
         group = "an individual submitter"
         expiration_date += datetime.timedelta(days=14)

ietf/doc/models.py

@@ -36,7 +36,7 @@
 from ietf.utils.validators import validate_no_control_chars
 from ietf.utils.mail import formataddr
 from ietf.utils.models import ForeignKey
-from ietf.utils.timezone import RPC_TZINFO
+from ietf.utils.timezone import date_today, RPC_TZINFO
 if TYPE_CHECKING:
     # importing other than for type checking causes errors due to cyclic imports
     from ietf.meeting.models import ProceedingsMaterial, Session
@@ -831,16 +831,20 @@ def save(self, *args, **kwargs):
     def telechat_date(self, e=None):
         if not e:
             e = self.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
-        return e.telechat_date if e and e.telechat_date and e.telechat_date >= datetime.date.today() else None
+        return e.telechat_date if e and e.telechat_date and e.telechat_date >= date_today(settings.TIME_ZONE) else None
 
     def past_telechat_date(self):
         "Return the latest telechat date if it isn't in the future; else None"
         e = self.latest_event(TelechatDocEvent, type="scheduled_for_telechat")
-        return e.telechat_date if e and e.telechat_date and e.telechat_date < datetime.date.today() else None
+        return e.telechat_date if e and e.telechat_date and e.telechat_date < date_today(settings.TIME_ZONE) else None
 
     def previous_telechat_date(self):
         "Return the most recent telechat date in the past, if any (even if there's another in the future)"
-        e = self.latest_event(TelechatDocEvent, type="scheduled_for_telechat", telechat_date__lt=timezone.now())
+        e = self.latest_event(
+            TelechatDocEvent,
+            type="scheduled_for_telechat",
+            telechat_date__lt=date_today(settings.TIME_ZONE),
+        )
         return e.telechat_date if e else None
 
     def request_closed_time(self, review_req):
@@ -906,14 +910,21 @@ def related_ipr(self):
     def future_presentations(self):
         """ returns related SessionPresentation objects for meetings that
             have not yet ended. This implementation allows for 2 week meetings """
-        candidate_presentations = self.sessionpresentation_set.filter(session__meeting__date__gte=datetime.date.today()-datetime.timedelta(days=15))
-        return sorted([pres for pres in candidate_presentations if pres.session.meeting.end_date()>=datetime.date.today()], key=lambda x:x.session.meeting.date)
+        candidate_presentations = self.sessionpresentation_set.filter(
+            session__meeting__date__gte=date_today() - datetime.timedelta(days=15)
+        )
+        return sorted(
+            [pres for pres in candidate_presentations
+             if pres.session.meeting.end_date() >= date_today()],
+            key=lambda x:x.session.meeting.date,
+        )
 
     def last_presented(self):
         """ returns related SessionPresentation objects for the most recent meeting in the past"""
         # Assumes no two meetings have the same start date - if the assumption is violated, one will be chosen arbitrariy
-        candidate_presentations = self.sessionpresentation_set.filter(session__meeting__date__lte=datetime.date.today())
-        candidate_meetings = set([p.session.meeting for p in candidate_presentations if p.session.meeting.end_date()<datetime.date.today()])
+        today = date_today()
+        candidate_presentations = self.sessionpresentation_set.filter(session__meeting__date__lte=today)
+        candidate_meetings = set([p.session.meeting for p in candidate_presentations if p.session.meeting.end_date()<today])
         if candidate_meetings:
             mtg = sorted(list(candidate_meetings),key=lambda x:x.date,reverse=True)[0]
             return self.sessionpresentation_set.filter(session__meeting=mtg)
@@ -962,7 +973,7 @@ def fake_history_obj(self, rev):
             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)