fix: timezone fixes from last few comparisons with tzaware-obe

Author: jennifer-richards

ietf/nomcom/management/commands/send_reminders.py

@@ -2,13 +2,14 @@
 # -*- coding: utf-8 -*-
 
 
-import datetime
 import syslog
 
 from django.core.management.base import BaseCommand
 
 from ietf.nomcom.models import NomCom, NomineePosition
 from ietf.nomcom.utils import send_accept_reminder_to_nominee,send_questionnaire_reminder_to_nominee
+from ietf.utils.timezone import date_today
+
 
 def log(message):
     syslog.syslog(message)
@@ -27,10 +28,10 @@ def handle(self, *args, **options):
         for nomcom in NomCom.objects.filter(group__state__slug='active'):
             nps = NomineePosition.objects.filter(nominee__nomcom=nomcom,nominee__duplicated__isnull=True)
             for nominee_position in nps.pending():
-                if is_time_to_send(nomcom, datetime.date.today(), nominee_position.time.date()):
+                if is_time_to_send(nomcom, date_today(), nominee_position.time.date()):
                     send_accept_reminder_to_nominee(nominee_position)
                     log('Sent accept reminder to %s' % nominee_position.nominee.email.address)
             for nominee_position in nps.accepted().without_questionnaire_response():
-                if is_time_to_send(nomcom, datetime.date.today(), nominee_position.time.date()):
+                if is_time_to_send(nomcom, date_today(), nominee_position.time.date()):
                     send_questionnaire_reminder_to_nominee(nominee_position)
                     log('Sent questionnaire reminder to %s' % nominee_position.nominee.email.address)

ietf/nomcom/tests.py

@@ -50,7 +50,7 @@
 from ietf.stats.factories import MeetingRegistrationFactory
 from ietf.utils.mail import outbox, empty_outbox, get_payload_text
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent
-from ietf.utils.timezone import datetime_today, datetime_from_date, DEADLINE_TZINFO
+from ietf.utils.timezone import date_today, datetime_today, datetime_from_date, DEADLINE_TZINFO
 
 
 client_test_cert_files = None
@@ -1130,7 +1130,7 @@ def tearDown(self):
 
     def test_is_time_to_send(self):
         self.nomcom.reminder_interval = 4
-        today = datetime.date.today()
+        today = date_today()
         self.assertTrue(is_time_to_send(self.nomcom,today+datetime.timedelta(days=4),today))
         for delta in range(4):
             self.assertFalse(is_time_to_send(self.nomcom,today+datetime.timedelta(days=delta),today))
@@ -1236,7 +1236,7 @@ def test_nominations_closed(self):
             self.assertIn( 'closed', q('.alert-warning').text())
 
     def test_acceptance_closed(self):
-        today = datetime.date.today().strftime('%Y%m%d')
+        today = date_today().strftime('%Y%m%d')
         pid = self.nc.position_set.first().nomineeposition_set.order_by('pk').first().id 
         url = reverse('ietf.nomcom.views.process_nomination_status', kwargs = {
                       'year' : self.nc.year(),
@@ -1892,7 +1892,7 @@ def first_meeting_of_year(year):
             assert year >= 1990
             return (year-1985)*3+2
         # Create meetings to ensure we have the 'last 5'
-        meeting_start = first_meeting_of_year(datetime.date.today().year-2)
+        meeting_start = first_meeting_of_year(date_today().year-2)
         # Populate the meeting registration records
         for number in range(meeting_start, meeting_start+10):
             meeting = MeetingFactory.create(type_id='ietf', number=number)

ietf/nomcom/utils.py

@@ -33,7 +33,7 @@
 from ietf.utils.mail import send_mail_text, send_mail, get_payload_text
 from ietf.utils.log import log
 from ietf.person.name import unidecode_name
-from ietf.utils.timezone import datetime_from_date, datetime_today, DEADLINE_TZINFO
+from ietf.utils.timezone import date_today, datetime_from_date, datetime_today, DEADLINE_TZINFO
 
 import debug                            # pyflakes:ignore
 
@@ -240,7 +240,7 @@ def validate_public_key(public_key):
 
 
 def send_accept_reminder_to_nominee(nominee_position):
-    today = datetime.date.today().strftime('%Y%m%d')
+    today = date_today().strftime('%Y%m%d')
     subject = 'Reminder: please accept (or decline) your nomination.'
     domain = Site.objects.get_current().domain
     position = nominee_position.position
@@ -332,7 +332,7 @@ def make_nomineeposition(nomcom, candidate, position, author):
         from_email = settings.NOMCOM_FROM_EMAIL.format(year=nomcom.year())
         (to_email, cc) = gather_address_lists('nomination_new_nominee',nominee=nominee.email.address)
         domain = Site.objects.get_current().domain
-        today = datetime.date.today().strftime('%Y%m%d')
+        today = date_today().strftime('%Y%m%d')
         hash = get_hash_nominee_position(today, nominee_position.id)
         accept_url = reverse('ietf.nomcom.views.process_nomination_status',
                               None,

ietf/nomcom/views.py

@@ -45,6 +45,8 @@
 from ietf.ietfauth.utils import role_required
 from ietf.person.models import Person
 from ietf.utils.response import permission_denied
+from ietf.utils.timezone import date_today
+
 
 import debug                  # pyflakes:ignore
 
@@ -702,7 +704,7 @@ def process_nomination_status(request, year, nominee_position_id, state, date, h
     expiration_days = getattr(settings, 'DAYS_TO_EXPIRE_NOMINATION_LINK', None)
     if expiration_days:
         request_date = datetime.date(int(date[:4]), int(date[4:6]), int(date[6:]))
-        if datetime.date.today() > (request_date + datetime.timedelta(days=settings.DAYS_TO_EXPIRE_NOMINATION_LINK)):
+        if date_today() > (request_date + datetime.timedelta(days=expiration_days)):
             permission_denied(request, "Link expired.")
 
     need_confirmation = True

ietf/person/templatetags/person_filters.py

@@ -8,14 +8,15 @@
 
 from ietf.nomcom.utils import is_eligible
 from ietf.person.models import Alias
+from ietf.utils.timezone import date_today
 
 register = template.Library()
 
 
 @register.filter
 def is_nomcom_eligible(person, date=None):
     if date is None:
-        date = datetime.date.today()
+        date = date_today()
     return is_eligible(person=person, date=date)
 
 

ietf/person/views.py

@@ -10,6 +10,7 @@
 from django.db.models import Q
 from django.http import HttpResponse, Http404
 from django.shortcuts import render, get_object_or_404, redirect
+from django.utils import timezone
 
 import debug                            # pyflakes:ignore
 
@@ -76,7 +77,7 @@ def profile(request, email_or_name):
     persons = [ p for p in persons if p and p.id ]
     if not persons:
         raise Http404
-    return render(request, 'person/profile.html', {'persons': persons, 'today':datetime.date.today()})
+    return render(request, 'person/profile.html', {'persons': persons, 'today': timezone.now()})
 
 
 def photo(request, email_or_name):

ietf/review/mailarch.py

@@ -25,6 +25,8 @@
 from django.utils.encoding import force_bytes, force_str
 
 from ietf.utils.mail import get_payload_text
+from ietf.utils.timezone import date_today
+
 
 def list_name_from_email(list_email):
     if not list_email.endswith("@ietf.org"):
@@ -51,7 +53,7 @@ def construct_query_urls(doc, team, query=None):
 
     encoded_query = "?" + urlencode({
         "qdr": "c", # custom time frame
-        "start_date": (datetime.date.today() - datetime.timedelta(days=180)).isoformat(),
+        "start_date": (date_today() - datetime.timedelta(days=180)).isoformat(),
         "email_list": list_name,
         "q": "subject:({})".format(query),
         "as": "1", # this is an advanced search

ietf/review/models.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-import datetime
-
 from simple_history.models import HistoricalRecords
 
 from django.db import models
@@ -18,6 +16,8 @@
     ReviewAssignmentStateName, ReviewerQueuePolicyName
 from ietf.utils.validators import validate_regular_expression_string
 from ietf.utils.models import ForeignKey, OneToOneField
+from ietf.utils.timezone import date_today
+
 
 class ReviewerSettings(models.Model):
     """Keeps track of admin data associated with a reviewer in a team."""
@@ -67,7 +67,7 @@ class UnavailablePeriod(models.Model):
     history      = HistoricalRecords(history_change_reason_field=models.TextField(null=True))
     team         = ForeignKey(Group, limit_choices_to=~models.Q(reviewteamsettings=None))
     person       = ForeignKey(Person)
-    start_date   = models.DateField(default=datetime.date.today, null=True, help_text="Choose the start date so that you can still do a review if it's assigned just before the start date - this usually means you should mark yourself unavailable for assignment some time before you are actually away. The default is today.")
+    start_date   = models.DateField(default=date_today, null=True, help_text="Choose the start date so that you can still do a review if it's assigned just before the start date - this usually means you should mark yourself unavailable for assignment some time before you are actually away. The default is today.")
     end_date     = models.DateField(blank=True, null=True, help_text="Leaving the end date blank means that the period continues indefinitely. You can end it later.")
     AVAILABILITY_CHOICES = [
         ("canfinish", "Can do follow-ups"),
@@ -81,8 +81,7 @@ class UnavailablePeriod(models.Model):
     reason       = models.TextField(verbose_name="Reason why reviewer is unavailable (Optional)", max_length=2048, blank=True, help_text="Provide (for the secretary's benefit) the reason why the review is unavailable", default='')
 
     def state(self):
-        import datetime
-        today = datetime.date.today()
+        today = date_today()
         if self.start_date is None or self.start_date <= today:
             if not self.end_date or today <= self.end_date:
                 return "active"

ietf/review/utils.py

@@ -32,7 +32,7 @@
 from ietf.utils.mail import send_mail
 from ietf.doc.utils import extract_complete_replaces_ancestor_mapping_for_docs
 from ietf.utils import log
-from ietf.utils.timezone import datetime_today, DEADLINE_TZINFO
+from ietf.utils.timezone import date_today, datetime_today, DEADLINE_TZINFO
 
 
 # The origin date is used to have a single reference date for "every X days".
@@ -93,12 +93,12 @@ def no_review_from_teams_on_doc(doc, rev):
 
 def unavailable_periods_to_list(past_days=14):
     return UnavailablePeriod.objects.filter(
-        Q(end_date=None) | Q(end_date__gte=datetime.date.today() - datetime.timedelta(days=past_days)),
+        Q(end_date=None) | Q(end_date__gte=date_today() - datetime.timedelta(days=past_days)),
     ).order_by("start_date")
 
 def current_unavailable_periods_for_reviewers(team):
     """Return dict with currently active unavailable periods for reviewers."""
-    today = datetime.date.today()
+    today = date_today()
 
     unavailable_period_qs = UnavailablePeriod.objects.filter(
         Q(end_date__gte=today) | Q(end_date=None),
@@ -877,7 +877,7 @@ def email_reviewer_reminder(assignment):
     review_request = assignment.review_request
     team = review_request.team
 
-    deadline_days = (review_request.deadline - datetime.date.today()).days
+    deadline_days = (review_request.deadline - date_today(DEADLINE_TZINFO)).days
 
     subject = "Reminder: deadline for review of {} in {} is {}".format(review_request.doc.name, team.acronym, review_request.deadline.isoformat())
 
@@ -943,7 +943,7 @@ def email_secretary_reminder(assignment, secretary_role):
     review_request = assignment.review_request
     team = review_request.team
 
-    deadline_days = (review_request.deadline - datetime.date.today()).days
+    deadline_days = (review_request.deadline - date_today(DEADLINE_TZINFO)).days
 
     subject = "Reminder: deadline for review of {} in {} is {}".format(review_request.doc.name, team.acronym, review_request.deadline.isoformat())
 

ietf/secr/meetings/views.py

@@ -31,7 +31,7 @@
 from ietf.secr.sreq.views import get_initial_session
 from ietf.secr.utils.meeting import get_session, get_timeslot
 from ietf.mailtrigger.utils import gather_address_lists
-from ietf.utils.timezone import make_aware
+from ietf.utils.timezone import date_today, make_aware
 
 
 # prep for agenda changes
@@ -314,7 +314,7 @@ def blue_sheet_redirect(request):
     This is the generic blue sheet URL.  It gets the next IETF meeting and redirects
     to the meeting specific URL.
     '''
-    today = datetime.date.today()
+    today = date_today()
     qs = Meeting.objects.filter(date__gt=today,type='ietf').order_by('date')
     if qs:
         meeting = qs[0]